Revert "Add initialize db function for smoke test"

This reverts commit 8d743975f0a0ab068638c37c4e665ca615e4a5da.

Change-Id: Ie447f9f630a323e19e62ae0eaba731e435554cc6

diff --git a/src/unit_tests/common/smoke_utils.cc b/src/unit_tests/common/smoke_utils.cc
index 1ad087b..5c7db50 100644 (file)
--- a/src/unit_tests/common/smoke_utils.cc
+++ b/src/unit_tests/common/smoke_utils.cc
@@ -8,7 +8,6 @@
 #include <gum/gum-user-service.h>
 #include <gum/common/gum-user-types.h>
 #include <manifest_parser/utils/version_number.h>
-#include <pkgmgr_parser_db.h>
 
 #include <boost/filesystem/path.hpp>
 #include <gtest/gtest.h>
@@ -37,11 +36,9 @@ const char kMigrateTestDBName[] = "app2sd_migrate.db";
 // common entries
 const std::vector<std::string> kDBEntries = {
   {".pkgmgr_parser.db"},
-  {".pkgmgr_parser.db-shm"},
-  {".pkgmgr_parser.db-wal"},
+  {".pkgmgr_parser.db-journal"},
   {".pkgmgr_cert.db"},
-  {".pkgmgr_cert.db-shm"},
-  {".pkgmgr_cert.db-wal"},
+  {".pkgmgr_cert.db-journal"},
   {".app2sd.db"},
   {".app2sd.db-journal"},
 };
@@ -837,14 +834,6 @@ bool RestorePath(const bf::path& path) {
   return true;
 }
 
-bool InitTestDB(uid_t test_uid) {
-  if (pkgmgr_parser_create_and_initialize_db(test_uid) < 0) {
-    LOG(ERROR) << "Failed to initialize db for uid : " << test_uid;
-    return false;
-  }
-  return true;
-}
-
 std::vector<bf::path> SetupBackupDirectories(uid_t test_uid) {
   std::vector<bf::path> entries;
   bf::path db_dir = bf::path(tzplatform_getenv(TZ_SYS_DB));

diff --git a/src/unit_tests/common/smoke_utils.h b/src/unit_tests/common/smoke_utils.h
index 5834426..3c8dd30 100644 (file)
--- a/src/unit_tests/common/smoke_utils.h
+++ b/src/unit_tests/common/smoke_utils.h
@@ -281,8 +281,6 @@ bool BackupPath(const boost::filesystem::path& path);
 
 bool RestorePath(const boost::filesystem::path& path);
 
-bool InitTestDB(uid_t test_uid);
-
 std::vector<boost::filesystem::path> SetupBackupDirectories(uid_t test_uid);
 
 void UninstallAllAppsInDirectory(boost::filesystem::path dir, bool is_preload,