Fixed path in test configuration file removed

[Bug/Feature]   Tests don't work on some installations
[Cause]         There is a fixed path in test configuration file
[Solution]      Remove fixed path in test configuration file
[Verification]  Build, install, run test ContainersManagerSuite

Change-Id: Icd7bff311d2d1e9e982bbee8d577247fb66da1a4

diff --git a/tests/unit_tests/server/configs/CMakeLists.txt b/tests/unit_tests/server/configs/CMakeLists.txt
index 42b76d8..fac2f9c 100644 (file)
--- a/tests/unit_tests/server/configs/CMakeLists.txt
+++ b/tests/unit_tests/server/configs/CMakeLists.txt
@@ -55,6 +55,14 @@ CONFIGURE_FILE(ut-network-admin/containers/buggy.conf.in
                ${CMAKE_BINARY_DIR}/ut-network-admin/containers/buggy.conf @ONLY)
 FILE(GLOB network_container_CONF_GEN ${CMAKE_BINARY_DIR}/ut-network-admin/containers/*.conf)
 
+CONFIGURE_FILE(ut-containers-manager/libvirt-config/console1-dbus.xml.in
+               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console1-dbus.xml @ONLY)
+CONFIGURE_FILE(ut-containers-manager/libvirt-config/console2-dbus.xml.in
+               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console2-dbus.xml @ONLY)
+CONFIGURE_FILE(ut-containers-manager/libvirt-config/console3-dbus.xml.in
+               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console3-dbus.xml @ONLY)
+FILE(GLOB manager_admin_CONF_GEN ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/*.xml)
+
 CONFIGURE_FILE(ut-container/libvirt-config/test-dbus.xml.in
                ${CMAKE_BINARY_DIR}/ut-container/libvirt-config/test-dbus.xml @ONLY)
 FILE(GLOB container_admin_CONF_GEN ${CMAKE_BINARY_DIR}/ut-container/libvirt-config/*.xml)
@@ -74,6 +82,8 @@ INSTALL(FILES        ${manager_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/containers)
 INSTALL(FILES        ${manager_admin_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/libvirt-config)
+INSTALL(FILES        ${manager_admin_CONF_GEN}
+        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/libvirt-config)
 
 INSTALL(FILES        ${container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container)

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
similarity index 78%
rename from tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml
rename to tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
index 3df8595..7aea75f 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
@@ -6,7 +6,7 @@
         <type>exe</type>
         <init>/bin/dbus-daemon</init>
         <initarg>--nofork</initarg>
-        <initarg>--config-file=/usr/share/security-containers/tests/server/ut-containers-manager/ut-dbus.conf</initarg>
+        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
         <initarg>--address=unix:path=/tmp/ut-containers-manager/console1-dbus/dbus/system_bus_socket</initarg>
     </os>
     <devices>

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
similarity index 78%
rename from tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml
rename to tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
index 0fc7e83..0336d3d 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
@@ -6,7 +6,7 @@
         <type>exe</type>
         <init>/bin/dbus-daemon</init>
         <initarg>--nofork</initarg>
-        <initarg>--config-file=/usr/share/security-containers/tests/server/ut-containers-manager/ut-dbus.conf</initarg>
+        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
         <initarg>--address=unix:path=/tmp/ut-containers-manager/console2-dbus/dbus/system_bus_socket</initarg>
     </os>
     <devices>

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
similarity index 78%
rename from tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml
rename to tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
index a341cb3..0b65ad4 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
@@ -6,7 +6,7 @@
         <type>exe</type>
         <init>/bin/dbus-daemon</init>
         <initarg>--nofork</initarg>
-        <initarg>--config-file=/usr/share/security-containers/tests/server/ut-containers-manager/ut-dbus.conf</initarg>
+        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
         <initarg>--address=unix:path=/tmp/ut-containers-manager/console3-dbus/dbus/system_bus_socket</initarg>
     </os>
     <devices>