Build fix for the latest core/ruby-bindings, use Docker at Travis (#277)

* Mock missing YaST modules

* Debugging - remove this commit

* Use Docker at Travis

* fix last failed test

* Changes

- 3.2.6

.travis.yml

@@ -1,18 +1,12 @@
-language: cpp
-compiler:
-    - gcc
+sudo: required
+language: ruby
+services:
+  - docker
+
 before_install:
-    # disable rvm, use system Ruby
-    - rvm reset
-    - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-xml yast2-transfer yast2-services-manager yast2-installation yast2-installation-control yast2-packager yast2-slp trang" -g "rspec:3.3.0 yast-rake gettext cheetah"
+  - docker build -t yast-autoyast-image .
 script:
-    - rake check:syntax
-    - rake check:pot
-    - rake test:unit
-    - make -f Makefile.cvs
-    - make
-    - sudo make install
-    - make check
-    - ./check_schema.sh
-
+  # the "yast-travis" script is included in the base yastdevel/ruby-tw image
+  # see https://github.com/yast/docker-yast-ruby-tw/blob/master/yast-travis
+  - docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-autoyast-image yast-travis
+  - docker run -it yast-autoyast-image ./check_schema.sh

Dockerfile

@@ -0,0 +1,7 @@
+FROM yastdevel/ruby-tw
+COPY . /tmp/sources
+RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
+  trang \
+  libxml2-tools \
+  libxslt-tools
+

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan  5 13:56:23 UTC 2017 - lslezak@suse.cz
+
+- Fixed tests to pass with the latest yast2-core and
+  yast2-ruby-bindings packages (related to the bsc#932331 fix)
+- 3.2.6
+
 -------------------------------------------------------------------
 Wed Dec 14 15:32:06 CET 2016 - schubi@suse.de
 

package/autoyast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.2.5
+Version:        3.2.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

test/AutoinstPartPlan_test.rb

@@ -10,16 +10,6 @@
 describe Yast::AutoinstPartPlan do
   let(:target_map_path) { File.join(FIXTURES_PATH, "storage", "nfs_root.yml") }
   let(:target_map_clone) { File.join(FIXTURES_PATH, "storage", "target_clone.yml") }
-  let(:default_subvol) { "@" }
-  let(:filesystems) do
-    double("filesystems",
-      default_subvol: default_subvol, read_default_subvol_from_target: default_subvol)
-  end
-
-  before do
-    allow(Yast).to receive(:import).with("FileSystems").and_return(nil)
-    stub_const("Yast::FileSystems", filesystems)
-  end
 
   describe "#read partition target" do
 

test/test_helper.rb

@@ -11,3 +11,39 @@
 end
 
 FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+
+# mock missing YaST modules, they are needed by an early import call
+module Yast
+  class FileSystemsClass
+    def default_subvol
+      "@"
+    end
+
+    def read_default_subvol_from_target
+      "@"
+    end
+
+    def default_subvol_from_product
+      "@"
+    end
+
+    def GetAllFileSystems(_add_swap, _add_pseudo, _label)
+      {}
+    end
+  end
+  FileSystems = FileSystemsClass.new
+
+  class KeyboardClass
+    def dummy
+      true
+    end
+  end
+  Keyboard = KeyboardClass.new
+
+  class TimezoneClass
+    def dummy
+      true
+    end
+  end
+  Timezone = TimezoneClass.new
+end