Make tests independent from running Vasum server instance

[Bug]           Running tests when Vasum server was up caused "Connection
                refused" error in vasum-cli.
[Cause]         Unit tests used vasum-ipc.socket, which overriden the
                connection between CLI and Vasum server.
[Solution]      Separate unit-tests IPC socket from Vasum server socket.
                Unit-tests now create and use their own socket:
                vasum-ipc-unit-tests.socket
[Verification]  Build, install, run Vasum service, run all tests.
                Ensure that CLI works after tests finish running.

Change-Id: Ic94500b743e990273361d85dffecfbe17ddc0347

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a87b41..308fb45 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,6 @@ ADD_DEFINITIONS(-DVASUM_USER="${VASUM_USER}")
 ADD_DEFINITIONS(-DINPUT_EVENT_GROUP="${INPUT_EVENT_GROUP}")
 ADD_DEFINITIONS(-DDISK_GROUP="${DISK_GROUP}")
 ADD_DEFINITIONS(-DTTY_GROUP="${TTY_GROUP}")
-ADD_DEFINITIONS(-DHOST_IPC_SOCKET="/var/run/vasum-ipc.socket")
 #ADD_DEFINITIONS(-DDBUS_CONNECTION)
 
 ## Python packages directory ###################################################
@@ -170,6 +169,8 @@ IF(NOT DEFINED DATA_DIR)
 ENDIF(NOT DEFINED DATA_DIR)
 
 SET(VSM_CONFIG_INSTALL_DIR ${SYSCONF_INSTALL_DIR}/vasum)
+SET(VSM_SERVER_IPC_SOCKET_PATH /var/run/vasum-ipc.socket)
+SET(VSM_UNIT_TESTS_IPC_SOCKET_PATH /var/run/vasum-ipc-unit-tests.socket)
 
 ADD_SUBDIRECTORY(${CLIENT_FOLDER})
 ADD_SUBDIRECTORY(${SERVER_FOLDER})

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 296e638..afe609f 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -42,8 +42,10 @@ ADD_DEFINITIONS(-fvisibility=hidden)
 
 ## Setup target ################################################################
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${project_SRCS} ${common_SRCS})
-SET_PROPERTY(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${_LIB_SOVERSION_})
-SET_PROPERTY(TARGET ${PROJECT_NAME} PROPERTY   VERSION ${_LIB_VERSION_})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+        SOVERSION ${_LIB_SOVERSION_}
+        VERSION ${_LIB_VERSION_}
+        COMPILE_DEFINITIONS HOST_IPC_SOCKET="${VSM_SERVER_IPC_SOCKET_PATH}")
 
 
 ## Link libraries ##############################################################

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 9470754..2dbc322 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${SERVER_DEPS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 SET_TARGET_PROPERTIES(${SERVER_CODENAME} PROPERTIES
     COMPILE_FLAGS "-pthread"
+    COMPILE_DEFINITIONS HOST_IPC_SOCKET="${VSM_SERVER_IPC_SOCKET_PATH}"
     LINK_FLAGS "-pthread"
 )
 

diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index 692ec4b..bed7d37 100644 (file)
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -55,11 +55,13 @@ INCLUDE_DIRECTORIES(SYSTEM ${UT_SERVER_DEPS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 SET_TARGET_PROPERTIES(${UT_SERVER_CODENAME} PROPERTIES
     COMPILE_FLAGS "-pthread"
+    COMPILE_DEFINITIONS HOST_IPC_SOCKET="${VSM_UNIT_TESTS_IPC_SOCKET_PATH}"
     LINK_FLAGS "-pthread"
 )
 
 SET_TARGET_PROPERTIES(${SOCKET_TEST_CODENAME} PROPERTIES
     COMPILE_FLAGS "-pthread"
+    COMPILE_DEFINITIONS HOST_IPC_SOCKET="${VSM_UNIT_TESTS_IPC_SOCKET_PATH}"
     LINK_FLAGS "-pthread"
 )