system-db proper clearing after test run.

Change-Id: I804faf8564ec868ee96e1a5a1a35c74eebe5d6e2

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 4bf75f2..fe7ec2e 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -192,6 +192,16 @@ ScopedSaveData::~ScopedSaveData()
     check_remove_allowed(m_alias.c_str());
 }
 
+void GarbageCollector::add(const char* alias)
+{
+    save_item item;
+    item.item_alias = std::string(alias);
+    item.owner_label = std::string(get_label().get());
+    item.owner_uid = geteuid();
+    item.owner_gid = getegid();
+    m_garbage.push_back(item);
+}
+
 void GarbageCollector::save(const char* alias, const char *data, int expected_err)
 {
     save(alias, data, strlen(data), expected_err);
@@ -202,14 +212,7 @@ void GarbageCollector::save(const char* alias, const char *data, size_t len, int
     save_data(alias, data, len, expected_err);
 
     if(CKMC_ERROR_NONE == expected_err)
-    {
-        save_item item;
-        item.item_alias = std::string(alias);
-        item.owner_label = std::string(get_label().get());
-        item.owner_uid = geteuid();
-        item.owner_gid = getegid();
-        m_garbage.push_back(item);
-    }
+        add(alias);
 }
 
 GarbageCollector::~GarbageCollector()

diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h
index 3694f0a..538c578 100644 (file)
--- a/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@ -136,6 +136,7 @@ class GarbageCollector
 public:
     void save(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE);
     void save(const char* alias, const char *data, size_t len, int expected_err);
+    void add(const char* alias);
     virtual ~GarbageCollector();
 
 private:

diff --git a/src/ckm/system-db.cpp b/src/ckm/system-db.cpp
index 6b705f0..97b48a5 100644 (file)
--- a/src/ckm/system-db.cpp
+++ b/src/ckm/system-db.cpp
@@ -327,8 +327,11 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
     // try to create signature in system DB  - expect fail
 
     // [prepare]
+    GarbageCollector gc;
     const char *private_key_alias = "/ sys-db-priv";
     const char *public_key_alias = "/ sys-db-pub";
+    gc.add(private_key_alias);
+    gc.add(public_key_alias);
     ckmc_policy_s policy_private_key;
     ckmc_policy_s policy_public_key;
     policy_private_key.password = NULL;