Skip to content

Commit 7bc74e6

Browse files
SimonThalvorsenSimonThalvorsen
committed
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 7bc74e6

5 files changed

Lines changed: 133 additions & 0 deletions

File tree

‎tests/shell/048_remove_with_dependencies.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
cfbs validate
17+
18+
! grep '"name": "example-module"' cfbs.json
19+
! grep '"name": "example-dependency"' cfbs.json
20+
21+
22+
23+
cp ../shell/048_remove_with_dependencies/example-cfbs.json cfbs.json
24+
cfbs validate
25+
26+
grep '"name": "example-module"' cfbs.json
27+
grep '"name": "example-dependency"' cfbs.json
28+
29+
cfbs --non-interactive remove example-dependency --non-interactive
30+
cfbs validate
31+
32+
grep '"name": "example-module"' cfbs.json
33+
! grep '"name": "example-dependency"' cfbs.json

‎tests/shell/048_remove_with_dependencies/example-cfbs.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"name": "example-project",
3+
"description": "Example description",
4+
"type": "policy-set",
5+
"build": [
6+
{
7+
"name": "masterfiles-example-module",
8+
"description": "Example",
9+
"url": "https://github.com/example/",
10+
"commit": "0000000000000000000000000000000000000000",
11+
"added_by": "cfbs add",
12+
"steps": ["run this"]
13+
},
14+
{
15+
"name": "example-module",
16+
"description": "Example",
17+
"url": "https://github.com/example/",
18+
"commit": "0000000000000000000000000000000000000000",
19+
"added_by": "cfbs add",
20+
"steps": ["delete this"]
21+
},
22+
{
23+
"name": "example-dependency",
24+
"description": "Example",
25+
"url": "https://github.com/example/",
26+
"commit": "0000000000000000000000000000000000000000",
27+
"dependencies": ["example-module"],
28+
"added_by": "cfbs add",
29+
"steps": ["delete this"]
30+
}
31+
]
32+
}

‎tests/shell/049_remove_with_circular_dependencies.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
cfbs validate
17+
18+
! grep '"name": "example-module"' cfbs.json
19+
! grep '"name": "example-dependency"' cfbs.json
20+
21+
22+
23+
cp ../shell/049_remove_with_circular_dependencies/example-cfbs.json cfbs.json
24+
cfbs validate
25+
26+
grep '"name": "example-module"' cfbs.json
27+
grep '"name": "example-dependency"' cfbs.json
28+
29+
cfbs --non-interactive remove example-dependency --non-interactive
30+
cfbs validate
31+
32+
! grep '"name": "example-module"' cfbs.json
33+
! grep '"name": "example-dependency"' cfbs.json

‎tests/shell/049_remove_with_circular_dependencies/example-cfbs.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"name": "example-project",
3+
"description": "Example description",
4+
"type": "policy-set",
5+
"build": [
6+
{
7+
"name": "masterfiles-example-module",
8+
"description": "Example",
9+
"url": "https://github.com/example/",
10+
"commit": "0000000000000000000000000000000000000000",
11+
"added_by": "cfbs add",
12+
"steps": ["run this"]
13+
},
14+
{
15+
"name": "example-module",
16+
"description": "Example",
17+
"url": "https://github.com/example/",
18+
"commit": "0000000000000000000000000000000000000000",
19+
"dependencies": ["example-dependency"],
20+
"added_by": "cfbs add",
21+
"steps": ["delete this"]
22+
},
23+
{
24+
"name": "example-dependency",
25+
"description": "Example",
26+
"url": "https://github.com/example/",
27+
"commit": "0000000000000000000000000000000000000000",
28+
"dependencies": ["example-module"],
29+
"added_by": "cfbs add",
30+
"steps": ["delete this"]
31+
}
32+
]
33+
}

‎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)