From: Lukasz Wojciechowski Date: Tue, 17 Mar 2015 12:31:40 +0000 (+0100) Subject: Load default database at every cynara-test startup X-Git-Tag: security-manager_5.5_testing~135 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Ftest%2Fsecurity-tests.git;a=commitdiff_plain;h=271ac5ac762bcd7e1f9e45e1b0643f31a40d07ce Load default database at every cynara-test startup All tests assume that their are run on clear cynara database. On real image database can contain some data. To save those data save/restore mechanism existed. It was expanded with 3rd function loading default database after original image database was saved. Change-Id: If580a11b6558b8084c959366dcfa50a1ef92782c --- diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp index afeec79..e35477c 100644 --- a/src/cynara-tests/common/cynara_test_commons.cpp +++ b/src/cynara-tests/common/cynara_test_commons.cpp @@ -39,6 +39,7 @@ void environmentWrap(const char *testName, const std::function &func { CynaraTestEnv env(testName); env.save(); + env.loadDefaultDatabase(); try { func(); diff --git a/src/cynara-tests/common/cynara_test_env.cpp b/src/cynara-tests/common/cynara_test_env.cpp index 3185007..ba3350a 100644 --- a/src/cynara-tests/common/cynara_test_env.cpp +++ b/src/cynara-tests/common/cynara_test_env.cpp @@ -29,6 +29,7 @@ CynaraTestEnv::CynaraTestEnv(const char *dirName) m_saveDir = TMP_DIR + "/" + dirName; m_dbSaveDir = m_saveDir + "/db"; m_pluginsSaveDir = m_saveDir + "/plugins"; + m_defaultDir = "/etc/security-tests/db_patterns/default"; } CynaraTestEnv::~CynaraTestEnv() @@ -74,3 +75,13 @@ void CynaraTestEnv::restore() removeDirIfExists(m_pluginsSaveDir); removeDirIfExists(m_saveDir); } + +void CynaraTestEnv::loadDefaultDatabase() +{ + CynaraMask mask; + + if (m_dbPresent) { + removeDirFiles(CynaraTestConsts::DB_DIR); + copyCynaraFiles(m_defaultDir, CynaraTestConsts::DB_DIR); + } +} diff --git a/src/cynara-tests/common/cynara_test_env.h b/src/cynara-tests/common/cynara_test_env.h index 707e852..6c528f7 100644 --- a/src/cynara-tests/common/cynara_test_env.h +++ b/src/cynara-tests/common/cynara_test_env.h @@ -27,11 +27,13 @@ public: void save(); void restore(); + void loadDefaultDatabase(); private: std::string m_saveDir; std::string m_dbSaveDir; std::string m_pluginsSaveDir; + std::string m_defaultDir; bool m_dbPresent; };