Merge pull request #199 from yast/catch_exceptions

Catch exceptions also when loading the available extensions (bsc#941491)

package/yast2-registration.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 14 16:01:41 UTC 2015 - lslezak@suse.cz
+
+- Catch exceptions also when loading the available extensions
+  (bsc#941491)
+- 3.1.141
+
 -------------------------------------------------------------------
 Fri Aug 14 15:11:37 UTC 2015 - ancor@suse.com
 

package/yast2-registration.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.140
+Version:        3.1.141
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/clients/inst_scc.rb

@@ -154,7 +154,11 @@ def get_available_addons
       # cache the available addons
       return :cancel if init_registration == :cancel
 
-      registration_ui.get_available_addons
+      addons_loaded = Registration::ConnectHelpers.catch_registration_errors do
+        registration_ui.get_available_addons
+      end
+
+      return :cancel unless addons_loaded
 
       @addons_registered_orig = Registration::Addon.registered.dup
     end

test/inst_scc_test.rb

@@ -28,6 +28,22 @@
       expect(Yast::WFM.call("inst_scc")).to eq(:abort)
     end
 
+    it "displays an error when loading the available extensions fails" do
+      error = "Invalid system credentials"
+      # click installing extensions, abort the workflow
+      expect(Yast::UI).to receive(:UserInput).and_return(:extensions, :abort)
+
+      expect(Yast::Report).to receive(:Error) do |msg|
+        # make sure the propoer error is displayed
+        expect(msg).to include(error)
+      end
+
+      expect_any_instance_of(Registration::RegistrationUI).to receive(:get_available_addons)
+        .and_raise(error)
+
+      expect(Yast::WFM.call("inst_scc")).to eq(:abort)
+    end
+
     it "goes back to initial screen when aborting selection of url" do
       # User clicks on 'select extensions' first time the initial screen is
       # displayed and 'finish' the second time