Merge pull request #275 from yast/find-base-product

Do not depend on system-installation() when finding base product

package/yast2-packager.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep  5 12:47:26 UTC 2017 - igonzalezsosa@suse.com
+
+- Product's detection on single product media does not require
+  the 'system-installation()' tag anymore (fate#322276)
+- 3.3.11
+
 -------------------------------------------------------------------
 Tue Sep  5 10:24:26 UTC 2017 - igonzalezsosa@suse.com
 

package/yast2-packager.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.3.10
+Version:        3.3.11
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/lib/y2packager/product_reader.rb

@@ -41,6 +41,13 @@ def self.available_base_products
                                 installation_package: installation_mapping[prod["name"]])
       end
 
+      # If no product contains a 'system-installation()' tag but there is only 1 product,
+      # we assume that it is the base one.
+      if result.size == 1 && installation_mapping.empty?
+        log.info "Assuming that #{result.inspect} is the base product."
+        return result
+      end
+
       # only installable products
       result.select!(&:installation_package)
 

test/product_reader_test.rb

@@ -18,11 +18,12 @@
 describe Y2Packager::ProductReader do
   subject { Y2Packager::ProductReader }
   let(:products) { YAML.load(File.read(FIXTURES_PATH.join("products-sles15.yml"))) }
+  let(:installation_package_map) { { "SLES" => "skelcd-SLES" } }
 
   describe "#available_base_products" do
     before do
       # TODO: proper mocking of pkg methods
-      allow(subject).to receive(:installation_package_mapping).and_return("SLES" => "skelcd-SLES")
+      allow(subject).to receive(:installation_package_mapping).and_return(installation_package_map)
     end
 
     it "returns empty list if there is no product" do
@@ -57,5 +58,32 @@
 
       expect(subject.available_base_products.size).to eq(1)
     end
+
+    context "when no product with system-installation() tag exists" do
+      let(:installation_package_map) { {} }
+      let(:prod1) { { "name" => "SLES" } }
+      let(:prod2) { { "name" => "SLED" } }
+
+      before do
+        allow(Yast::Pkg).to receive(:ResolvableProperties).with("", :product, "")
+          .and_return(products)
+      end
+
+      context "and only 1 product exists" do
+        let(:products) { [prod1] }
+
+        it "returns the found product" do
+          expect(subject.available_base_products.size).to eq(1)
+        end
+      end
+
+      context "and more than 1 product exsits" do
+        let(:products) { [prod1, prod2] }
+
+        it "returns an empty array" do
+          expect(subject.available_base_products).to be_empty
+        end
+      end
+    end
   end
 end