Merge pull request #27 from k0sproject/defer-rm

Cleanup of leftover files generated during e2e tests
k0sproject · Sep 15, 2023 · a07adfd · a07adfd
2 parents da9ad76 + 1e91c68
commit a07adfd
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 0 deletions.
diff --git a/tests/test-basic-commands-%image.cmd b/tests/test-basic-commands-%image.cmd
@@ -1,5 +1,6 @@
 # Test that common utilities are present in the base images
 footloose config create --config %testName.footloose --override --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 footloose --config %testName.footloose ssh root@node0 hostname

diff --git a/tests/test-config-get-ubuntu18.04.cmd b/tests/test-config-get-ubuntu18.04.cmd
@@ -1,2 +1,3 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --networks=net1,net2 --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %out footloose config get --config %testName.footloose machines[0].spec
diff --git a/tests/test-create-config-already-exists-%image.cmd b/tests/test-create-config-already-exists-%image.cmd
@@ -1,2 +1,3 @@
 footloose config create --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 footloose config create --config %testName.footloose --name %testName --key %testName-key --image %image
diff --git a/tests/test-create-delete-%image.cmd b/tests/test-create-delete-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 %out docker ps --format {{.Names}} -f label=io.k0sproject.footloose.cluster=%testName

diff --git a/tests/test-create-delete-idempotent-%image.cmd b/tests/test-create-delete-idempotent-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 footloose create --config %testName.footloose

diff --git a/tests/test-create-delete-persistent-%image.cmd b/tests/test-create-delete-persistent-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 %out docker ps --format {{.Names}} -f label=io.k0sproject.footloose.cluster=%testName

diff --git a/tests/test-create-stop-start-%image.cmd b/tests/test-create-stop-start-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 %out docker ps --format {{.Names}} -f label=io.k0sproject.footloose.cluster=%testName

diff --git a/tests/test-show-ubuntu18.04.cmd b/tests/test-show-ubuntu18.04.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image ubuntu18.04
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 footloose delete --config %testName.footloose

diff --git a/tests/test-ssh-remote-command-%image.cmd b/tests/test-ssh-remote-command-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 %out footloose --config %testName.footloose ssh root@node0 hostname
diff --git a/tests/test-ssh-user-%image.cmd b/tests/test-ssh-user-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 footloose show --config %testName.footloose

diff --git a/tests/test-start-stop-specific-%image.cmd b/tests/test-start-stop-specific-%image.cmd
@@ -1,4 +1,5 @@
 footloose config create --override --config %testName.footloose --name %testName --key %testName-key --image %image --replicas 3
+%defer rm -f %testName.footloose %testName-key %testName-key.pub
 %defer footloose delete --config %testName.footloose
 footloose create --config %testName.footloose
 footloose stop %testName-node1 --config %testName.footloose