From 50b836518c1f031a33b255f6684ded0422d5a8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 12 Dec 2019 08:35:20 +0100 Subject: [PATCH] test: drop cargo-cult line p2 is only used in the cryptsetup test... --- test/TEST-01-BASIC/test.sh | 2 -- test/TEST-06-SELINUX/test.sh | 1 - test/TEST-08-ISSUE-2730/test.sh | 2 -- test/TEST-13-NSPAWN-SMOKE/test.sh | 2 -- test/TEST-14-MACHINE-ID/test.sh | 2 -- test/test-functions | 2 -- 6 files changed, 11 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index e07e1f3771..c3901e2f57 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -11,8 +11,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - setup_basic_environment ) setup_nspawn_root diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh index 5f22b3b74e..f17242c6e1 100755 --- a/test/TEST-06-SELINUX/test.sh +++ b/test/TEST-06-SELINUX/test.sh @@ -21,7 +21,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment mask_supporting_services diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 7acca157d2..1887978dfc 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -13,8 +13,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - setup_basic_environment rm $initdir/etc/fstab diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index d81de0ebca..48449c66e5 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -11,8 +11,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - setup_basic_environment mask_supporting_services diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh index caae487134..4668392b91 100755 --- a/test/TEST-14-MACHINE-ID/test.sh +++ b/test/TEST-14-MACHINE-ID/test.sh @@ -11,8 +11,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - setup_basic_environment mask_supporting_services printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >$initdir/etc/machine-id diff --git a/test/test-functions b/test/test-functions index a7f28493ce..b910603cea 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1907,8 +1907,6 @@ test_setup() { # Create what will eventually be our root filesystem onto an overlay ( LOG_LEVEL=5 - eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) - setup_basic_environment mask_supporting_services )