portusctl: fixed error on Travis

Signed-off-by: Miquel Sabaté Solà <[email protected]>
SUSE · Oct 19, 2016 · fe5f560 · fe5f560
1 parent 6b4dcbe
commit fe5f560
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packaging/suse/portusctl/lib/registry.rb b/packaging/suse/portusctl/lib/registry.rb
@@ -45,7 +45,7 @@ def registry_local?
         return user_confirm?
       end
 
-      return registry_safe_install! if $CHILD_STATUS == ZYPPER_NOT_INSTALLED
+      return registry_safe_install! if installed_error?
       false
     end
 
@@ -71,6 +71,12 @@ def install_registry_rpm!
       Runner.safe_exec("zypper", ["-q", "-n", "--no-gpg-checks", "in", REGISTRY_RPM])
     end
 
+    # Returns true if the last system() call returned a ZYPPER_NOT_INSTALLED
+    # error.
+    def installed_error?
+      $CHILD_STATUS == ZYPPER_NOT_INSTALLED
+    end
+
     # Returns true if the user wrote either "y", "yes" (including uppercase
     # variations) or nothing.
     def user_confirm?

diff --git a/packaging/suse/portusctl/spec/registry_spec.rb b/packaging/suse/portusctl/spec/registry_spec.rb
@@ -15,12 +15,15 @@ def user_confirm?
     val = ENV["TEST_CONFIRM"]
     val == "y" || val == "yes"
   end
+
+  def installed_error?
+    ZYPPER_NOT_INSTALLED == ENV["TEST_EXIT_STATUS"].to_i
+  end
 end
 
 class Runner
   def self.safe_exec_test(_cmd, _args = [])
     if ENV["TEST_EXIT_STATUS"]
-      $CHILD_STATUS = ENV["TEST_EXIT_STATUS"].to_i
       false
     else
       true