mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests/int: rm teardown_running_container_inroot

Browse Source 
It is only used in a couple of places and is easy to replace
with ROOT=xxx teardown_running_container.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2021-01-20 19:26:33 -08:00
parent 78f0e4b277
commit 0cfc2e327d
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/helpers.bash
-4
View File
@@ -478,10 +478,6 @@ function teardown_running_container() {
__runc delete -f "$1" __runc delete -f "$1"
} }
function teardown_running_container_inroot() {
ROOT="$2" __runc delete -f "$1"
}
function teardown_busybox() { function teardown_busybox() {
cd "$INTEGRATION_ROOT" cd "$INTEGRATION_ROOT"
teardown_recvtty teardown_recvtty
tests/integration/list.bats
+4 -7
View File
@@ -3,17 +3,14 @@
load helpers load helpers
function setup() { function setup() {
teardown_running_container_inroot test_box1 "$HELLO_BUNDLE" teardown
teardown_running_container_inroot test_box2 "$HELLO_BUNDLE"
teardown_running_container_inroot test_box3 "$HELLO_BUNDLE"
teardown_busybox
setup_busybox setup_busybox
} }
function teardown() { function teardown() {
teardown_running_container_inroot test_box1 "$HELLO_BUNDLE" ROOT="$HELLO_BUNDLE" teardown_running_container test_box1
teardown_running_container_inroot test_box2 "$HELLO_BUNDLE" ROOT="$HELLO_BUNDLE" teardown_running_container test_box2
teardown_running_container_inroot test_box3 "$HELLO_BUNDLE" ROOT="$HELLO_BUNDLE" teardown_running_container test_box3
teardown_busybox teardown_busybox
} }
tests/integration/root.bats
+2 -3
View File
@@ -3,13 +3,12 @@
load helpers load helpers
function setup() { function setup() {
teardown_running_container_inroot test_dotbox "$HELLO_BUNDLE" teardown
teardown_busybox
setup_busybox setup_busybox
} }
function teardown() { function teardown() {
teardown_running_container_inroot test_dotbox "$HELLO_BUNDLE" ROOT="$HELLO_BUNDLE" teardown_running_container test_dotbox
teardown_busybox teardown_busybox
} }