Fix path to the dbus-daemon

[Bug/Feature]   Fix path to the dbus-daemon
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install, run tests, run daemon

Change-Id: I9d8006b238bdf8ad22675c618213c10931938b0f
Signed-off-by: Dariusz Michaluk <d.michaluk@samsung.com>

diff --git a/tests/unit_tests/dbus/ut-connection.cpp b/tests/unit_tests/dbus/ut-connection.cpp
index eed9af7..46b9aa9 100644 (file)
--- a/tests/unit_tests/dbus/ut-connection.cpp
+++ b/tests/unit_tests/dbus/ut-connection.cpp
@@ -51,7 +51,7 @@ using namespace security_containers::dbus;
 
 namespace {
 
-const char* DBUS_DAEMON_PROC = "/bin/dbus-daemon";
+const char* DBUS_DAEMON_PROC = "/usr/bin/dbus-daemon";
 const char* const DBUS_DAEMON_ARGS[] = {
     DBUS_DAEMON_PROC,
     "--config-file=" SC_TEST_CONFIG_INSTALL_DIR "/dbus/ut-connection/ut-dbus.conf",

diff --git a/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in b/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in
index c57a948..555a9c6 100644 (file)
--- a/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in
+++ b/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in
@@ -6,7 +6,7 @@
         <type>exe</type>
         <init>/bin/sh</init>
         <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; /bin/dbus-daemon --config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container/ut-dbus.conf --fork; read</initarg>
+        <initarg>trap exit SIGTERM; /usr/bin/dbus-daemon --config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container/ut-dbus.conf --fork; read</initarg>
     </os>
     <devices>
         <console type="pty"/>

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
index 6d24978..3bce659 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
@@ -4,7 +4,7 @@
     <memory>102400</memory>
     <os>
         <type>exe</type>
-        <init>/bin/dbus-daemon</init>
+        <init>/usr/bin/dbus-daemon</init>
         <initarg>--nofork</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>

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
index 5fe2996..f98c9bd 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
@@ -4,7 +4,7 @@
     <memory>102400</memory>
     <os>
         <type>exe</type>
-        <init>/bin/dbus-daemon</init>
+        <init>/usr/bin/dbus-daemon</init>
         <initarg>--nofork</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>

diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
index be4d618..8175bcf 100644 (file)
--- a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
+++ b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
@@ -4,7 +4,7 @@
     <memory>102400</memory>
     <os>
         <type>exe</type>
-        <init>/bin/dbus-daemon</init>
+        <init>/usr/bin/dbus-daemon</init>
         <initarg>--nofork</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>

diff --git a/tests/unit_tests/server/ut-container-connection.cpp b/tests/unit_tests/server/ut-container-connection.cpp
index 92f98ac..9f7b680 100644 (file)
--- a/tests/unit_tests/server/ut-container-connection.cpp
+++ b/tests/unit_tests/server/ut-container-connection.cpp
@@ -48,7 +48,7 @@ using namespace security_containers::dbus;
 
 namespace {
 
-const char* DBUS_DAEMON_PROC = "/bin/dbus-daemon";
+const char* DBUS_DAEMON_PROC = "/usr/bin/dbus-daemon";
 const char* const DBUS_DAEMON_ARGS[] = {
     DBUS_DAEMON_PROC,
     "--config-file=" SC_TEST_CONFIG_INSTALL_DIR "/server/ut-container-connection/ut-dbus.conf",