Adjust restart of cynara in cynara-tests

[platform/core/test/security-tests.git] / src / cynara-tests / test_cases_db.cpp

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);
 }