Skip to content

Commit 3ca5d87

Browse files
CFE-3948: Added tests to the updated remove functionality
Ticket: CFE-3948 Signed-off-by: Simon Halvorsen <simon.halvorsen@northern.tech>
1 parent 8ff3b80 commit 3ca5d87

5 files changed

Lines changed: 111 additions & 0 deletions

File tree

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
set -e
2+
set -x
3+
cd tests/
4+
mkdir -p ./tmp/
5+
cd ./tmp/
6+
touch cfbs.json && rm cfbs.json
7+
rm -rf .git
8+
9+
cp ../shell/048_remove_with_dependencies/example-cfbs.json cfbs.json
10+
cfbs validate
11+
12+
grep '"name": "example-module"' cfbs.json
13+
grep '"name": "example-dependency"' cfbs.json
14+
15+
cfbs --non-interactive remove example-module --non-interactive
16+
17+
! grep '"name": "example-module"' cfbs.json
18+
! grep '"name": "example-dependency"' cfbs.json
19+
20+
21+
cp ../shell/048_remove_with_dependencies/example-cfbs.json cfbs.json
22+
cfbs validate
23+
24+
grep '"name": "example-module"' cfbs.json
25+
grep '"name": "example-dependency"' cfbs.json
26+
27+
cfbs --non-interactive remove example-dependency --non-interactive
28+
29+
grep '"name": "example-module"' cfbs.json
30+
! grep '"name": "example-dependency"' cfbs.json
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "example-project",
3+
"description": "Example description",
4+
"type": "policy-set",
5+
"build": [
6+
{
7+
"name": "example-module",
8+
"description": "Example",
9+
"url": "https://github.com/example/",
10+
"commit": "0000000000000000000000000000000000000000",
11+
"added_by": "cfbs add",
12+
"steps": ["delete this"]
13+
},
14+
{
15+
"name": "example-dependency",
16+
"description": "Example",
17+
"url": "https://github.com/example/",
18+
"commit": "0000000000000000000000000000000000000000",
19+
"dependencies": ["example-module"],
20+
"added_by": "cfbs add",
21+
"steps": ["delete this"]
22+
}
23+
]
24+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
set -e
2+
set -x
3+
cd tests/
4+
mkdir -p ./tmp/
5+
cd ./tmp/
6+
touch cfbs.json && rm cfbs.json
7+
rm -rf .git
8+
9+
cp ../shell/049_remove_with_circular_dependencies/example-cfbs.json cfbs.json
10+
cfbs validate
11+
12+
grep '"name": "example-module"' cfbs.json
13+
grep '"name": "example-dependency"' cfbs.json
14+
15+
cfbs --non-interactive remove example-module --non-interactive
16+
17+
! grep '"name": "example-module"' cfbs.json
18+
! grep '"name": "example-dependency"' cfbs.json
19+
20+
21+
cp ../shell/049_remove_with_circular_dependencies/example-cfbs.json cfbs.json
22+
cfbs validate
23+
24+
grep '"name": "example-module"' cfbs.json
25+
grep '"name": "example-dependency"' cfbs.json
26+
27+
cfbs --non-interactive remove example-dependency --non-interactive
28+
29+
! grep '"name": "example-module"' cfbs.json
30+
! grep '"name": "example-dependency"' cfbs.json
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "example-project",
3+
"description": "Example description",
4+
"type": "policy-set",
5+
"build": [
6+
{
7+
"name": "example-module",
8+
"description": "Example",
9+
"url": "https://github.com/example/",
10+
"commit": "0000000000000000000000000000000000000000",
11+
"dependencies": ["example-dependency"],
12+
"added_by": "cfbs add",
13+
"steps": ["delete this"]
14+
},
15+
{
16+
"name": "example-dependency",
17+
"description": "Example",
18+
"url": "https://github.com/example/",
19+
"commit": "0000000000000000000000000000000000000000",
20+
"dependencies": ["example-module"],
21+
"added_by": "cfbs add",
22+
"steps": ["delete this"]
23+
}
24+
]
25+
}

tests/shell/all.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ run_test tests/shell/044_replace.sh
9191
run_test tests/shell/045_update_from_url_branch_uptodate.sh
9292
run_test tests/shell/046_update_from_url_branch.sh
9393
run_test tests/shell/047_absolute_path_modules.sh
94+
run_test tests/shell/048_remove_with_dependencies.sh
95+
run_test tests/shell/049_remove_with_circular_dependencies.sh
9496

9597
# Summary
9698
_suite_end=$(date +%s)

0 commit comments

Comments
 (0)