Merge pull request #388 from yast/merge_sp3_fix

Merge the SP3 test fix to SP4

package/yast2-registration.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul 25 11:58:13 UTC 2018 - lslezak@suse.com
+
+- Updated the unit test to pass with the latest SUSEConnect
+  (bsc#1102540)
+- 3.2.14
+
+-------------------------------------------------------------------
+Wed Jul 18 10:45:15 CEST 2018 - schubi@suse.de
+
+- Do not crash if getting zypp lock failed. (bnc#1043125)
+- 3.2.13
+
 -------------------------------------------------------------------
 Thu Jun 22 13:46:00 UTC 2017 - lslezak@suse.cz
 

package/yast2-registration.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.2.12
+Version:        3.2.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -53,7 +53,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  yast2-devtools >= 3.1.39
 BuildRequires:  rubygem(yast-rake) >= 0.2.5
 BuildRequires:  rubygem(rspec)
-BuildRequires:  rubygem(suse-connect) >= 0.2.22
+BuildRequires:  rubygem(suse-connect) >= 0.3.11
 BuildRequires:  yast2-slp >= 3.1.9
 # packager/product_patterns.rb
 BuildRequires:  yast2-packager >= 3.1.95

src/clients/scc.rb

@@ -52,6 +52,12 @@ def main
           return WFM.call("inst_scc", WFM.Args)
         rescue Registration::SourceRestoreError => e
           retry if fix_repositories(e.message)
+        rescue Registration::PkgAborted => e
+          # Libzypp init has failed because another application
+          # has already locked the zypp stack. The user has already
+          # decided to exit the module. So nothing more has to be
+          # done here.
+          log.info "User abort..."
         ensure
           Wizard.CloseDialog
         end

src/lib/registration/exceptions.rb

@@ -41,4 +41,9 @@ class SourceRestoreError < PkgError
   # generic download error
   class DownloadError < RuntimeError
   end
+
+  # User decision to abort because libzypp has already been
+  # locked by another application.
+  class PkgAborted < RuntimeError
+  end
 end

src/lib/registration/sw_mgmt.rb

@@ -66,6 +66,9 @@ class SwMgmt
     def self.init(load_packages = false)
       # false = do not allow continuing without the libzypp lock
       lock = PackageLock.Connect(false)
+      # User would like to abort
+      raise_pkg_exception(PkgAborted) if lock["aborted"]
+      # locking has failed
       raise_pkg_exception unless lock["connected"]
 
       # display progress when refreshing repositories

test/connect_helpers_spec.rb

@@ -4,7 +4,7 @@
 require "registration/connect_helpers"
 
 # helper for creating the SCC API error exceptions
-def api_error(code: 400, headers: {}, body: "")
+def api_error(code: 400, headers: {}, body: {})
   SUSE::Connect::ApiError.new(
     OpenStruct.new(
       code:    code,

test/sw_mgmt_spec.rb

@@ -50,11 +50,13 @@
 
   describe ".init" do
     before do
-      allow(Yast::PackageLock).to receive(:Connect).and_return("connected" => connected)
+      allow(Yast::PackageLock).to receive(:Connect).and_return("connected" => connected,
+                                                               "aborted"   => aborted)
     end
 
     context "when the libzypp lock can be obtained" do
       let(:connected) { true }
+      let(:aborted) { false }
 
       before do
         expect(Yast::PackageCallbacks).to receive(:InitPackageCallbacks)
@@ -76,10 +78,22 @@
     end
 
     context "when the libzypp lock cannot be obtained" do
-      let(:connected) { false }
+      context "when user has NOT aborted" do
+        let(:connected) { false }
+        let(:aborted) { false }
 
-      it "raises an PkgError exception" do
-        expect { subject.init }.to raise_error(Registration::PkgError)
+        it "raises an PkgError exception" do
+          expect { subject.init }.to raise_error(Registration::PkgError)
+        end
+      end
+
+      context "when user has aborted" do
+        let(:connected) { false }
+        let(:aborted) { true }
+
+        it "raises an PkgAborted exception" do
+          expect { subject.init }.to raise_error(Registration::PkgAborted)
+        end
       end
     end
   end