Adjust tests to lxc-1.1.3

[Feature]       Adjust tests to lxc-1.1.3
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install, run tests

Change-Id: I26d3abed39b60f5072399edcb116567d125d82f0

diff --git a/tests/unit_tests/configs/templates/buggy-template.conf b/tests/unit_tests/configs/templates/buggy-template.conf
index 2ce4024..1f78be4 100644 (file)
--- a/tests/unit_tests/configs/templates/buggy-template.conf
+++ b/tests/unit_tests/configs/templates/buggy-template.conf
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "/buggy/path",
-    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; read"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; while true; do sleep 0.1; done"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/configs/templates/console-dbus.conf.in b/tests/unit_tests/configs/templates/console-dbus.conf.in
index 1ef567f..2dee28b 100644 (file)
--- a/tests/unit_tests/configs/templates/console-dbus.conf.in
+++ b/tests/unit_tests/configs/templates/console-dbus.conf.in
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "minimal.sh",
-    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; /bin/dbus-daemon --config-file=@VSM_TEST_CONFIG_INSTALL_DIR@/dbus/ut-dbus-system.conf --fork; read"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; /bin/dbus-daemon --config-file=@VSM_TEST_CONFIG_INSTALL_DIR@/dbus/ut-dbus-system.conf --fork"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/configs/templates/console-ipc.conf.in b/tests/unit_tests/configs/templates/console-ipc.conf.in
index dce9410..5abf8ba 100644 (file)
--- a/tests/unit_tests/configs/templates/console-ipc.conf.in
+++ b/tests/unit_tests/configs/templates/console-ipc.conf.in
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "minimal.sh",
-    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; read"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; while true; do sleep 0.1; done"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/configs/templates/default.conf b/tests/unit_tests/configs/templates/default.conf
index 276adc9..006b9e4 100644 (file)
--- a/tests/unit_tests/configs/templates/default.conf
+++ b/tests/unit_tests/configs/templates/default.conf
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "minimal.sh",
-    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; read"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; while true; do sleep 0.1; done"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/configs/templates/minimal.sh b/tests/unit_tests/configs/templates/minimal.sh
index 948cf01..12b921a 100755 (executable)
--- a/tests/unit_tests/configs/templates/minimal.sh
+++ b/tests/unit_tests/configs/templates/minimal.sh
@@ -59,8 +59,6 @@ lxc.tty = 0
 #lxc.loglevel = TRACE
 #lxc.logfile = /tmp/${name}.log
 
-lxc.cgroup.devices.deny = a
-
 lxc.mount.auto = proc sys cgroup
 lxc.mount.entry = /bin bin none ro,bind 0 0
 lxc.mount.entry = /etc etc none ro,bind 0 0

diff --git a/tests/unit_tests/configs/templates/missing.conf b/tests/unit_tests/configs/templates/missing.conf
index 4d5abd6..88679e5 100644 (file)
--- a/tests/unit_tests/configs/templates/missing.conf
+++ b/tests/unit_tests/configs/templates/missing.conf
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "missing.sh",
-    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; read"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; while true; do sleep 0.1; done"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/configs/templates/test-no-shutdown.conf b/tests/unit_tests/configs/templates/test-no-shutdown.conf
index 026c3e7..a60520f 100644 (file)
--- a/tests/unit_tests/configs/templates/test-no-shutdown.conf
+++ b/tests/unit_tests/configs/templates/test-no-shutdown.conf
@@ -1,6 +1,6 @@
 {
     "zoneTemplate" : "minimal.sh",
-    "initWithArgs" : ["/bin/bash"],
+    "initWithArgs" : ["/bin/bash", "-c", "trap exit SIGTERM; while true; do sleep 0.1; done"],
     "requestedState" : "running",
     "ipv4Gateway" : "",
     "ipv4" : "",

diff --git a/tests/unit_tests/lxc/ut-zone.cpp b/tests/unit_tests/lxc/ut-zone.cpp
index 7dae96e..47c1414 100644 (file)
--- a/tests/unit_tests/lxc/ut-zone.cpp
+++ b/tests/unit_tests/lxc/ut-zone.cpp
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(StartShutdown)
     const char* argv[] = {
         "/bin/bash",
         "-c",
-        "trap exit SIGTERM; read",
+        "trap exit SIGTERM; while true; do sleep 0.1; done",
         NULL
     };
     BOOST_CHECK(lxc.start(argv));
@@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE(FreezeUnfreeze)
     const char* argv[] = {
         "/bin/bash",
         "-c",
-        "trap exit SIGTERM; read",
+        "trap exit SIGTERM; while true; do sleep 0.1; done",
         NULL
     };
     BOOST_CHECK(lxc.start(argv));
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE(FreezeStop)
     const char* argv[] = {
         "/bin/bash",
         "-c",
-        "trap exit SIGTERM; read",
+        "trap exit SIGTERM; while true; do sleep 0.1; done",
         NULL
     };
     BOOST_CHECK(lxc.start(argv));
@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE(Repeat)
     const char* argv[] = {
         "/bin/bash",
         "-c",
-        "trap exit SIGTERM; read",
+        "trap exit SIGTERM; while true; do sleep 0.1; done",
         NULL
     };
     BOOST_CHECK(lxc.start(argv));
@@ -259,7 +259,7 @@ BOOST_AUTO_TEST_CASE(CreateFile)
     const char* argv[] = {
         "/bin/bash",
         "-c",
-        "trap exit SIGTERM; read",
+        "trap exit SIGTERM; while true; do sleep 0.1; done",
         NULL
     };
     BOOST_REQUIRE(lxc.start(argv));