Fix smoke-test functions for rollback cases

The custom step cannot be added outside of installer, because steps are
initialized when Run() invoked.
(If some step added outside of installer, that step will be executed at
first, ignoring original steps)
This patch defines a new virtual function creating overridden installer
object which is fail at the end of steps or specific stage.

Change-Id: I00eed98d51bb4d083c421baa6a83f4b8ca17e90d
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/unit_tests/common/smoke_utils.cc b/src/unit_tests/common/smoke_utils.cc
index 8f62dd9696eb99db4c7feaf34f939d52ea86e6a1..e7abce187ee0e83fbd9e6a71640e99f70a4e7dc2 100644 (file)
--- a/src/unit_tests/common/smoke_utils.cc
+++ b/src/unit_tests/common/smoke_utils.cc
@@ -511,10 +511,10 @@ void BackendInterface::TestRollbackAfterEachStep(int argc, const char* argv[],
     LOG(ERROR) << "Failed to initialize pkgmgr interface";
     return;
   }
-  auto backend = CreateInstaller(pkgmgr);
+  AppInstallerPtr backend;
   int i;
   for (i = backend->StepCount() - 1; i >= 0; i--) {
-    backend->AddStepAtIndex<ci::configuration::StepFail>(i);
+    backend = CreateFailExpectedInstaller(pkgmgr, i);
     LOG(DEBUG) << "StepFail is inserted at: " << i;
     ASSERT_EQ(ci::AppInstaller::Result::ERROR, backend->Run());
     if (!validator())
@@ -560,12 +560,13 @@ void BackendInterface::CrashAfterEachStep(std::vector<std::string>* args,
 
 BackendInterface::CommandResult BackendInterface::RunInstallerWithPkgrmgr(
     ci::PkgMgrPtr pkgmgr) const {
-  std::unique_ptr<ci::AppInstaller> installer = CreateInstaller(pkgmgr);
+  std::unique_ptr<ci::AppInstaller> installer;
   switch (mode_) {
   case RequestResult::FAIL:
-    installer->AddStep<ci::configuration::StepFail>();
+    installer = CreateFailExpectedInstaller(pkgmgr);
     break;
   default:
+    installer = CreateInstaller(pkgmgr);
     break;
   }
   return installer->Run();

diff --git a/src/unit_tests/common/smoke_utils.h b/src/unit_tests/common/smoke_utils.h
index d65d4a092da6e645795329f4172edb525bea292a..41ba53b8bec76f0966a51298eef5a7925b398291 100644 (file)
--- a/src/unit_tests/common/smoke_utils.h
+++ b/src/unit_tests/common/smoke_utils.h
@@ -24,7 +24,6 @@
 #include <manifest_parser/utils/version_number.h>
 
 #include <common/utils/subprocess.h>
-#include <common/step/configuration/step_fail.h>
 #include <common/utils/user_util.h>
 #include <common/utils/file_util.h>
 #include <common/request.h>
@@ -275,6 +274,8 @@ class BackendInterface {
   virtual AppQueryInterfacePtr CreateQueryInterface() const = 0;
   virtual AppInstallerPtr CreateInstaller(
       common_installer::PkgMgrPtr pkgmgr) const = 0;
+  virtual AppInstallerPtr CreateFailExpectedInstaller(
+      common_installer::PkgMgrPtr pkgmgr, int fail_at = -1) const = 0;
 };
 
 bool CheckAvailableExternalPath();