From: Ondrej Lichtner <olichtne(a)redhat.com>
These two tests don't require the use of a custom pool so I updated them
to reflect that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
regression-tests/tests/6/lnst-ctl.conf | 2 --
regression-tests/tests/6/run.sh | 6 +-----
regression-tests/tests/7/lnst-ctl.conf | 2 --
regression-tests/tests/7/run.sh | 6 +-----
4 files changed, 2 insertions(+), 14 deletions(-)
delete mode 100644 regression-tests/tests/6/lnst-ctl.conf
delete mode 100644 regression-tests/tests/7/lnst-ctl.conf
diff --git a/regression-tests/tests/6/lnst-ctl.conf
b/regression-tests/tests/6/lnst-ctl.conf
deleted file mode 100644
index 7a8d46d..0000000
--- a/regression-tests/tests/6/lnst-ctl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[environment]
-machine_pool_dirs = ./pool/
diff --git a/regression-tests/tests/6/run.sh b/regression-tests/tests/6/run.sh
index 3882d0d..02534e0 100755
--- a/regression-tests/tests/6/run.sh
+++ b/regression-tests/tests/6/run.sh
@@ -4,9 +4,7 @@
init_test
-ln -s ../../env/pool
-
-log=`lnst-ctl -c lnst-ctl.conf -d run recipe.xml`
+log=`lnst-ctl -d run recipe.xml`
rv=$?
echo "$log"
@@ -18,6 +16,4 @@ assert_log ".*"
"3_\(\([a-fA-F0-9]\{2\}:\?\)\{6\}\)_\1_" "$log"
assert_status "pass" "$rv"
-rm -f ./pool
-
end_test
diff --git a/regression-tests/tests/7/lnst-ctl.conf
b/regression-tests/tests/7/lnst-ctl.conf
deleted file mode 100644
index 7a8d46d..0000000
--- a/regression-tests/tests/7/lnst-ctl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[environment]
-machine_pool_dirs = ./pool/
diff --git a/regression-tests/tests/7/run.sh b/regression-tests/tests/7/run.sh
index 3882d0d..02534e0 100755
--- a/regression-tests/tests/7/run.sh
+++ b/regression-tests/tests/7/run.sh
@@ -4,9 +4,7 @@
init_test
-ln -s ../../env/pool
-
-log=`lnst-ctl -c lnst-ctl.conf -d run recipe.xml`
+log=`lnst-ctl -d run recipe.xml`
rv=$?
echo "$log"
@@ -18,6 +16,4 @@ assert_log ".*"
"3_\(\([a-fA-F0-9]\{2\}:\?\)\{6\}\)_\1_" "$log"
assert_status "pass" "$rv"
-rm -f ./pool
-
end_test
--
2.1.0