Merge branch 'cynara' into tizen

Change-Id: I2d1b3e38f0ccab3cec1a1a107fc778dfb604986f

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94eef00..b3c75e6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2011-2015 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

diff --git a/src/common/service_manager.cpp b/src/common/service_manager.cpp
index 5349171..c571d5f 100644 (file)
--- a/src/common/service_manager.cpp
+++ b/src/common/service_manager.cpp
@@ -26,6 +26,7 @@
 
 #include <dpl/test/test_runner.h>
 
+#include <algorithm>
 #include <sstream>
 #include <unistd.h>
 #include <vector>
@@ -45,9 +46,11 @@ const std::string MATCH_RELOADING("Reloading");
 
 }
 
-ServiceManager::ServiceManager(const std::string &serviceName)
+ServiceManager::ServiceManager(const std::string &serviceName,
+                               const std::vector<std::string>& socketsNames)
     : m_connection(DBUS_BUS_SYSTEM, true)
     , m_serviceName(serviceName)
+    , m_socketsNames(socketsNames)
 {
     addBusMatch(MATCH_JOB_REMOVED);
     addBusMatch(MATCH_JOB_NEW);
@@ -126,10 +129,10 @@ uint64_t ServiceManager::handleVariantUInt64MsgReply(DBus::MessageIn &messageIn)
     return iteratorSub.getArgUint64();
 }
 
-void ServiceManager::sendToService(const std::string &method)
+void ServiceManager::sendToService(const std::string &method, const std::string &unit)
 {
     DBus::MessageOut messageOut = newMethodCall(method);
-    messageOut.append(m_serviceName);
+    messageOut.append(unit);
     messageOut.append("fail");
     DBus::MessageIn messageIn = m_connection.sendWithReplyAndBlock(messageOut);
     m_runningJobs.insert(handleObjectPathMsgReply(messageIn));
@@ -222,7 +225,8 @@ void ServiceManager::signalJobRemovedHandler(DBus::MessageIn &messageIn)
     iterator.expectArgType(DBUS_TYPE_STRING);
     std::string result = iterator.getArgString();
 
-    if(m_serviceName == unit) {
+    if (unit == m_serviceName
+        || std::count(m_socketsNames.begin(), m_socketsNames.end(), unit) > 0) {
         RUNNER_ASSERT_MSG(result == "done" || result == "canceled",
                           "RemoveJob signal delivered bad news. Job wasn't completed successfully: "
                               << "expected job results = {done, canceled}, "
@@ -270,25 +274,40 @@ void ServiceManager::waitForRunningJobsFinish()
         m_connection.readWriteDispatch();
 }
 
-void ServiceManager::startService()
+void ServiceManager::executeMethod(const std::string &method, const std::string &unit)
 {
-    sendToService("StartUnit");
+    sendToService(method, unit);
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-void ServiceManager::stopService()
+void ServiceManager::startService(bool withSockets)
 {
-    sendToService("StopUnit");
-    waitForRunningJobsFinish();
-    sendResetFailedToService();
+    executeMethod("StartUnit", m_serviceName);
+    if (withSockets)
+        for (const auto &socket : m_socketsNames)
+            executeMethod("StartUnit", socket);
 }
 
-void ServiceManager::restartService()
+void ServiceManager::stopService(bool withSockets)
 {
-    sendToService("RestartUnit");
-    waitForRunningJobsFinish();
-    sendResetFailedToService();
+    if (withSockets)
+        for (const auto &socket : m_socketsNames)
+            executeMethod("StopUnit", socket);
+    executeMethod("StopUnit", m_serviceName);
+}
+
+void ServiceManager::restartService(bool withSockets)
+{
+    if (withSockets)
+        for (const auto &socket : m_socketsNames)
+            executeMethod("StopUnit", socket);
+
+    executeMethod("RestartUnit", m_serviceName);
+
+    if (withSockets)
+        for (const auto &socket : m_socketsNames)
+            executeMethod("StartUnit", socket);
 }
 
 pid_t ServiceManager::getServicePid()

diff --git a/src/common/service_manager.h b/src/common/service_manager.h
index f1f492f..7dbdecf 100644 (file)
--- a/src/common/service_manager.h
+++ b/src/common/service_manager.h
@@ -38,12 +38,13 @@
 class ServiceManager {
 public:
     ServiceManager() = delete;
-    ServiceManager(const std::string &serviceName);
+    ServiceManager(const std::string &serviceName,
+                   const std::vector<std::string>& socketsNames = {});
     ~ServiceManager() = default;
 
-    void startService();
-    void stopService();
-    void restartService();
+    void startService(bool withSockets = false);
+    void stopService(bool withSockets = false);
+    void restartService(bool withSockets = false);
     pid_t getServicePid();
     timeval getServiceStartTimestamp();
     void maskService();
@@ -59,7 +60,7 @@ private:
     uint32_t handleVariantUIntMsgReply(DBus::MessageIn &messageIn);
     uint64_t handleVariantUInt64MsgReply(DBus::MessageIn &messageIn);
 
-    void sendToService(const std::string &method);
+    void sendToService(const std::string &method, const std::string &unit);
     void sendMaskToService();
     void sendUnmaskToService();
     DBus::MessageIn sendPropertyGetMsg(const std::string &interface, const std::string &property);
@@ -73,9 +74,12 @@ private:
     void signalReloadingHandler(DBus::MessageIn &messageIn);
     void waitForRunningJobsFinish();
 
+    void executeMethod(const std::string &method, const std::string &unit);
+
     DBus::Connection m_connection;
 
     const std::string m_serviceName;
+    const std::vector<std::string> m_socketsNames;
     std::string m_unitPath;
 
     std::set<std::string> m_runningJobs;

diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
index 8c2f5a1..38c17dd 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.cpp
+++ b/src/cynara-tests/common/cynara_test_commons.cpp
@@ -31,6 +31,10 @@ const std::string DB_DIR(CYNARA_DB_DIR);
 const std::string USER("cynara");
 const std::string LABEL("System");
 const std::string SERVICE("cynara.service");
+const std::string SOCKET_CLIENT("cynara.socket");
+const std::string SOCKET_ADMIN("cynara-admin.socket");
+const std::string SOCKET_AGENT("cynara-agent.socket");
+
 const std::string SERVICE_PLUGINS_DIR("/usr/lib/cynara/plugin/service/");
 
 }
@@ -67,3 +71,18 @@ void loadServicePlugins(const DirectoryPaths &pluginDirectories)
     for (const auto &dir : pluginDirectories)
         FileOperations::copyCynaraFiles(dir.c_str(), CynaraTestConsts::SERVICE_PLUGINS_DIR);
 }
+
+void restartCynaraService()
+{
+    ServiceManager service(CynaraTestConsts::SERVICE);
+    service.restartService();
+}
+
+void restartCynaraServiceAndSockets()
+{
+    ServiceManager service(CynaraTestConsts::SERVICE, { CynaraTestConsts::SOCKET_CLIENT,
+                                                        CynaraTestConsts::SOCKET_ADMIN,
+                                                        CynaraTestConsts::SOCKET_AGENT });
+
+    service.restartService(true);
+}

diff --git a/src/cynara-tests/common/cynara_test_commons.h b/src/cynara-tests/common/cynara_test_commons.h
index 8ea8123..af8ac96 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.h
+++ b/src/cynara-tests/common/cynara_test_commons.h
@@ -36,6 +36,9 @@ extern const std::string USER;
 extern const std::string LABEL;
 extern const std::string SERVICE;
 extern const std::string SERVICE_PLUGINS_DIR;
+extern const std::string SOCKET_CLIENT;
+extern const std::string SOCKET_ADMIN;
+extern const std::string SOCKET_AGENT;
 
 }
 
@@ -57,4 +60,7 @@ void environmentWrap(const char *testName, const std::function<void(void)> &func
 typedef std::vector<std::string> DirectoryPaths;
 void loadServicePlugins(const DirectoryPaths &pluginDirectories);
 
+void restartCynaraService();
+void restartCynaraServiceAndSockets();
+
 #endif /* CYNARA_TEST_COMMONS_H_ */

diff --git a/src/cynara-tests/test_cases_agent.cpp b/src/cynara-tests/test_cases_agent.cpp
index 51fab54..a8c74ae 100644 (file)
--- a/src/cynara-tests/test_cases_agent.cpp
+++ b/src/cynara-tests/test_cases_agent.cpp
@@ -69,12 +69,6 @@ void setAgentPolicy(int expectedResult = CYNARA_API_SUCCESS)
     admin.setPolicies(cp, expectedResult);
 }
 
-void restartCynara()
-{
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-    serviceManager.restartService();
-}
-
 void getAgentRequest(Agent &agent, AgentRequest &request, Client &client,
                      int expectedResult = CYNARA_API_SUCCESS,
                      Timeout::ExpectMode expectTimeoutMode = Timeout::ExpectMode::TIMEOUT)
@@ -140,7 +134,7 @@ void tcag05_agent_request_timeout_func()
     };
 
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::TIMEOUT,
-                         restartCynara, hangOnGetRequest);
+                         restartCynaraServiceAndSockets, hangOnGetRequest);
 }
 
 void tcag06_check_with_unregistered_agent_func()
@@ -185,8 +179,9 @@ void tcag07_get_request_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
 
     agentRequest.assertAction(data.m_client, data.m_user, data.m_privilege);
     agent.putResponse(AgentResponse::createAllow(agentRequest.id()));
@@ -213,8 +208,9 @@ void tcag08_get_request_and_respond_with_wrong_id_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest.assertAction(data.m_client, data.m_user, data.m_privilege);
     agent.putResponse(AgentResponse::createAllow(agentRequest.id() + 1));
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_TIMEOUT, 2);
@@ -240,8 +236,9 @@ void tcag09_get_request_and_correct_responded_id_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest.assertAction(data.m_client, data.m_user, data.m_privilege);
     agent.putResponse(AgentResponse::createAllow(agentRequest.id() + 1));
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_TIMEOUT, 2);
@@ -270,13 +267,15 @@ void tcag10_cancel_request_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest.assertAction(data.m_client, data.m_user, data.m_privilege);
     client.cancel(id);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest.assertCancel();
     agent.putResponse(AgentResponse::createCancel(id));
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
@@ -303,15 +302,17 @@ void tcag11_cancel_processed_request_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest.assertAction(data.m_client, data.m_user, data.m_privilege);
     agent.putResponse(AgentResponse::createCancel(id));
     client.cancel(id);
     // we do not expect getting the cancel request in the agent
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::TIMEOUT,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                         std::ref(client), CYNARA_API_SERVICE_NOT_AVAILABLE, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest), std::ref(client),
+                         CYNARA_API_SERVICE_NOT_AVAILABLE, Timeout::ExpectMode::TIMEOUT);
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
@@ -340,16 +341,19 @@ void tcag12_create_two_requests_func()
 
     auto testTimeLimit = std::chrono::seconds(5);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest1),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest1), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest2),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::IGNORE);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest2), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::IGNORE);
     client.cancel(id2);
     client.assertStatus(READWRITE);
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequest, std::ref(agent), std::ref(agentRequest3),
-                         std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+                         restartCynaraServiceAndSockets, getAgentRequest,
+                         std::ref(agent), std::ref(agentRequest3), std::ref(client),
+                         CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     agentRequest1.assertAction(data1.m_client, data1.m_user, data1.m_privilege);
     agentRequest2.assertAction(data2.m_client, data2.m_user, data2.m_privilege);
     agentRequest3.assertCancel();
@@ -380,9 +384,10 @@ void tcag13_create_many_requests_func()
         client.createRequest(data, ids[i], callbackData);
         client.assertStatus(READWRITE);
         auto testTimeLimit = std::chrono::seconds(5);
-        Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED, restartCynara,
-                             getAgentRequest, std::ref(agent), std::ref(agentRequests[i]),
-                             std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+        Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
+                             restartCynaraServiceAndSockets, getAgentRequest,
+                             std::ref(agent), std::ref(agentRequests[i]), std::ref(client),
+                             CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
         agentRequests[i].assertAction(data.m_client, data.m_user, data.m_privilege);
     };
     for (int i = numberOfRequests - 1; i >= 0; i--) {
@@ -410,15 +415,15 @@ void tcag14_client_disconnects_func()
         client.createRequest(data, id, callbackData);
         client.assertStatus(READWRITE);
         Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                             restartCynara, getAgentRequest, std::ref(agent),
-                             std::ref(agentRequest), std::ref(client),
+                             restartCynaraServiceAndSockets, getAgentRequest,
+                             std::ref(agent), std::ref(agentRequest), std::ref(client),
                              CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     };
     auto getAgentRequestWrap = [&agent, &agentRequest]() {
             agent.getRequest(agentRequest, CYNARA_API_SUCCESS);
         };
     Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
-                         restartCynara, getAgentRequestWrap);
+                         restartCynaraServiceAndSockets, getAgentRequestWrap);
     agentRequest.assertCancel();
 }
 
@@ -440,9 +445,10 @@ void tcag15_agent_disconnects_func()
     {
         Agent agent;
         auto testTimeLimit = std::chrono::seconds(5);
-        Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED, restartCynara,
-                             getAgentRequest, std::ref(agent), std::ref(agentRequest),
-                             std::ref(client), CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
+        Timeout::callAndWait(testTimeLimit, Timeout::ExpectMode::FINISHED,
+                             restartCynaraServiceAndSockets, getAgentRequest,
+                             std::ref(agent), std::ref(agentRequest), std::ref(client),
+                             CYNARA_API_SUCCESS, Timeout::ExpectMode::TIMEOUT);
     };
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }

diff --git a/src/cynara-tests/test_cases_async.cpp b/src/cynara-tests/test_cases_async.cpp
index e866d53..1412fcd 100644 (file)
--- a/src/cynara-tests/test_cases_async.cpp
+++ b/src/cynara-tests/test_cases_async.cpp
@@ -224,7 +224,6 @@ void tca08_disconnect1_func()
 {
     std::string testNo("08");
     int subtest = 1;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -234,7 +233,7 @@ void tca08_disconnect1_func()
     client.createRequest({testNo, subtest}, id, callbackData);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.assertStatus(READ);
@@ -245,7 +244,6 @@ void tca08_disconnect2_func()
 {
     std::string testNo("08");
     int subtest = 2;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -255,12 +253,12 @@ void tca08_disconnect2_func()
     client.createRequest({testNo, subtest}, id, callbackData);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.assertStatus(READ);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
@@ -271,10 +269,7 @@ void tca08_disconnect3_func()
     std::string testNo("08");
     int subtest = 2;
     cynara_check_id id;
-    RequestEntity callbackData = {[&](){
-                                           ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-                                           serviceManager.restartService();
-                                       },
+    RequestEntity callbackData = {restartCynaraServiceAndSockets,
                                   CYNARA_API_ACCESS_DENIED,
                                   CYNARA_CALL_CAUSE_ANSWER};
     Client client;
@@ -293,7 +288,6 @@ void tca09_disconnect_and_cancel1_func()
 {
     std::string testNo("09");
     int subtest = 1;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -308,7 +302,7 @@ void tca09_disconnect_and_cancel1_func()
     client.process();
     client.assertStatus(READ);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.cancel(id);
     client.assertStatus(READWRITE);
@@ -326,7 +320,6 @@ void tca09_disconnect_and_cancel2_func()
 {
     std::string testNo("09");
     int subtest = 2;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -344,7 +337,7 @@ void tca09_disconnect_and_cancel2_func()
     client.cancel(id);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     //handle reconnect
     client.process();
@@ -390,8 +383,7 @@ void tca11_double_request_with_restart_func()
                                   CYNARA_CALL_CAUSE_ANSWER};
 
     RequestEntity callbackData = {[&](){
-                                      ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-                                      serviceManager.restartService();
+                                      restartCynaraServiceAndSockets();
                                       client.createRequest({testNo}, id2, callbackData2);
                                   },
                                   CYNARA_API_ACCESS_DENIED,

diff --git a/src/cynara-tests/test_cases_db.cpp b/src/cynara-tests/test_cases_db.cpp
index 16b3d91..a0f4d78 100644 (file)
--- a/src/cynara-tests/test_cases_db.cpp
+++ b/src/cynara-tests/test_cases_db.cpp
@@ -200,7 +200,6 @@ void tcdb01_lockdown_init_failure_func()
 {
     Admin admin;
     Client cynara;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *extra = nullptr;
@@ -213,7 +212,7 @@ void tcdb01_lockdown_init_failure_func()
     deleteDbFile(fakeBackupGuard);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
     compareDbs(defDbAllow);
 }
 
@@ -230,7 +229,6 @@ void tcdb02_write_to_backup_failure_func()
 {
     Admin admin;
     Client cynara;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *extra = nullptr;
@@ -243,7 +241,7 @@ void tcdb02_write_to_backup_failure_func()
     createDbFile(fakeBucketDumpFile);
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra, CYNARA_API_OPERATION_FAILED);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
     compareDbs(defDbAllow);
 }
 
@@ -261,7 +259,6 @@ void tcdb03_invalid_and_valid_backup_removal_func()
 {
     Admin admin;
     Client cynara;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *extra = nullptr;
@@ -271,12 +268,12 @@ void tcdb03_invalid_and_valid_backup_removal_func()
     createDbFile(defaultBucketDumpFile);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra, CYNARA_API_OPERATION_FAILED);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
     compareDbs(defDb);
 
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
     compareDbs(defDbAllow);
 }
 
@@ -319,8 +316,6 @@ void tcdb04_dumped_file_binary_comparison_func()
  */
 void tcdb05_non_indexed_files_removal_func()
 {
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-
     std::vector<std::string> filenames = { "_broken-backup~", "_non-indexed-bucket",
                                            "some-file-that-doesnt-belong-here" };
 
@@ -329,7 +324,7 @@ void tcdb05_non_indexed_files_removal_func()
         createDbFile(garbageFilename);
     }
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
     compareDbs(defDb);
 }