Merge remote-tracking branch 'origin/SLE-12-SP2' into sp2_merge

.gitignore

@@ -23,3 +23,6 @@ mkinstalldirs
 stamp-h*
 *.pot
 *.ami
+/coverage
+/.yardoc
+/doc

.travis.yml

@@ -5,6 +5,9 @@ services:
 
 before_install:
   - docker build -t yast-tune-image .
+  # list the installed packages (just for easier debugging)
+  - docker run --rm -it yast-tune-image rpm -qa | sort
+
 script:
   # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
   # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby

test/system_settings_test.rb

@@ -9,10 +9,13 @@
   KERNEL_SYSRQ_FILE = "/proc/sys/kernel/sysrq"
 
   subject(:settings) { Yast::SystemSettings }
+  let(:scheduler)     { "cfq" }
 
   before do
     allow(File).to receive(:exist?).and_return(true)
     allow(Yast::Bootloader).to receive(:Read)
+    allow(Yast::Bootloader).to receive(:kernel_param)
+      .with(:common, "elevator").and_return(scheduler)
     settings.main
   end
 
@@ -25,7 +28,6 @@
   describe "#Read" do
     let(:kernel_sysrq)  { "1" }
     let(:sysctl_sysrq)  { "1" }
-    let(:scheduler)     { "cfq" }
 
     before do
       allow(Yast::SCR).to receive(:Read)

test/test_helper.rb

@@ -8,9 +8,9 @@
     add_filter "/spec/"
   end
 
-  # for coverage we need to load all ruby files
   src_location = File.expand_path("../../src", __FILE__)
-  Dir["#{src_location}/{modules,lib}/**/*.rb"].each { |f| require_relative f }
+  # track all ruby files under src
+  SimpleCov.track_files("#{src_location}/**/*.rb")
 
   # use coveralls for on-line code coverage reporting at Travis CI
   if ENV["TRAVIS"]