Set result code as fake package manager failure info

And not description, like before Signed-off-by: Laurent Bonnans <[email protected]>
advancedtelematic · Mar 21, 2019 · ac922d0 · ac922d0
1 parent 5c34310
commit ac922d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/libaktualizr/package_manager/packagemanagerfake.cc b/src/libaktualizr/package_manager/packagemanagerfake.cc
@@ -28,10 +28,10 @@ data::InstallationResult PackageManagerFake::install(const Uptane::Target &targe
   if (fiu_fail("fake_package_install") != 0) {
     std::string failure_cause = fault_injection_last_info();
     if (failure_cause.empty()) {
-      failure_cause = "Installation failed";
+      return data::InstallationResult(data::ResultCode::Numeric::kInstallFailed, "");
     }
     LOG_DEBUG << "Causing installation failure with message: " << failure_cause;
-    return data::InstallationResult(data::ResultCode::Numeric::kInstallFailed, failure_cause);
+    return data::InstallationResult(data::ResultCode(data::ResultCode::Numeric::kInstallFailed, failure_cause), "");
   }
 
   if (config.fake_need_reboot) {
@@ -46,7 +46,7 @@ data::InstallationResult PackageManagerFake::install(const Uptane::Target &targe
   }
 
   storage_->savePrimaryInstalledVersion(target, InstalledVersionUpdateMode::kCurrent);
-  return data::InstallationResult(data::ResultCode::Numeric::kOk, "Installing fake package was successful");
+  return data::InstallationResult(data::ResultCode::Numeric::kOk, "Installing package was successful");
 }
 
 void PackageManagerFake::completeInstall() const {

diff --git a/src/libaktualizr/package_manager/packagemanagerfake_test.cc b/src/libaktualizr/package_manager/packagemanagerfake_test.cc
@@ -61,10 +61,9 @@ TEST(PackageManagerFake, FailureInjection) {
   fault_injection_disable("fake_package_install");
 
   // fault with custom data (through pid file)
-  fault_injection_enable("fake_package_install", 1, "Random cause", 0);
+  fault_injection_enable("fake_package_install", 1, "RANDOM_CAUSE", 0);
   result = fakepm.install(target);
-  EXPECT_EQ(result.result_code, data::ResultCode::Numeric::kInstallFailed);
-  EXPECT_EQ(result.description, "Random cause");
+  EXPECT_EQ(result.result_code, data::ResultCode(data::ResultCode::Numeric::kInstallFailed, "RANDOM_CAUSE"));
   fault_injection_disable("fake_package_install");
 }