Hello community,

here is the log from the commit of package yast2-country for openSUSE:Factory 
checked in at 2015-02-20 13:50:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-country"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes      
2015-02-14 13:51:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 
2015-02-20 13:50:41.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 13 14:40:53 UTC 2015 - [email protected]
+
+- Propose local time when running in a VMware VM, do not display
+  a warning when local time is selected (bnc#773323)
+- 3.1.19
+
+-------------------------------------------------------------------

Old:
----
  yast2-country-3.1.18.tar.bz2

New:
----
  yast2-country-3.1.19.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.y5chA4/_old  2015-02-20 13:50:42.000000000 +0100
+++ /var/tmp/diff_new_pack.y5chA4/_new  2015-02-20 13:50:42.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        3.1.18
+Version:        3.1.19
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +33,13 @@
 BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  yast2-perl-bindings
 BuildRequires:  yast2-testsuite
+# For tests
+BuildRequires:  rubygem(rspec)
+# Fix to bnc#891053 (proper reading of ".target.yast2" on chroots)
+BuildRequires:  yast2-core >= 3.1.12
+# RSpec extensions for YaST
+BuildRequires:  yast2-ruby-bindings >= 3.1.26
+
 Requires:       timezone
 Requires:       yast2-perl-bindings
 Requires:       yast2-trans-stats
@@ -47,6 +54,8 @@
 Conflicts:      yast2-ntp-client < 2.18.0
 # wrapper_storage.ycp
 Requires:       yast2-packager >= 2.23.3
+# VMware detection (.probe.is_vmware)
+Requires:       yast2-hardware-detection >= 3.1.6
 
 Requires:       yast2-country-data
 



++++++ yast2-country-3.1.18.tar.bz2 -> yast2-country-3.1.19.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/.coveralls.yml 
new/yast2-country-3.1.19/.coveralls.yml
--- old/yast2-country-3.1.18/.coveralls.yml     1970-01-01 01:00:00.000000000 
+0100
+++ new/yast2-country-3.1.19/.coveralls.yml     2015-02-16 13:59:13.000000000 
+0100
@@ -0,0 +1 @@
+service_name: travis-ci
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/.travis.yml 
new/yast2-country-3.1.19/.travis.yml
--- old/yast2-country-3.1.18/.travis.yml        2015-02-11 16:34:09.000000000 
+0100
+++ new/yast2-country-3.1.19/.travis.yml        2015-02-16 13:59:13.000000000 
+0100
@@ -5,12 +5,14 @@
     # 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-ruby-bindings yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 
yast2-ruby-bindings yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext 
simplecov coveralls"
 script:
     - rake check:syntax
     - rake check:pot
-    - make -f Makefile.cvs
-    - make
-    - sudo make install
-    - make check
+    - make -s -f Makefile.cvs
+    - make -s
+    - sudo make -s install
+    - make -s check
+    # evaluate code coverage for RSpec tests
+    - COVERAGE=1 rake test:unit
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/README.markdown 
new/yast2-country-3.1.19/README.markdown
--- old/yast2-country-3.1.18/README.markdown    2015-02-11 16:34:09.000000000 
+0100
+++ new/yast2-country-3.1.19/README.markdown    2015-02-16 13:59:13.000000000 
+0100
@@ -2,6 +2,7 @@
 
 [![Travis 
Build](https://travis-ci.org/yast/yast-country.svg?branch=master)](https://travis-ci.org/yast/yast-country)
 [![Jenkins 
Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-country-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-country-master/)
+[![Coverage 
Status](https://coveralls.io/repos/yast/yast-country/badge.svg)](https://coveralls.io/r/yast/yast-country)
 
 Country specific data and configuration modules (language, keyboard,
 timezone) for YaST2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/SCRStub.rb 
new/yast2-country-3.1.19/keyboard/test/SCRStub.rb
--- old/yast2-country-3.1.18/keyboard/test/SCRStub.rb   2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/SCRStub.rb   2015-02-16 
13:59:13.000000000 +0100
@@ -15,13 +15,6 @@
 #     end
 #
 module SCRStub
-  YAST2_PATH = Yast::Path.new(".target.yast2")
-  YCP_PATH = Yast::Path.new(".target.ycp")
-  SIZE_PATH = Yast::Path.new(".target.size")
-  BASH_PATH = Yast::Path.new(".target.bash")
-  STRING_PATH = Yast::Path.new(".target.string")
-  REMOVE_PATH = Yast::Path.new(".target.remove")
-
   # Ensures that non-stubbed SCR calls still works as expected after including
   # the module in the testsuite
   # different methods of the module
@@ -33,45 +26,13 @@
     end
   end
 
-  # Encapsulates subsequent SCR calls into a chroot.
-  #
-  # Raises an exception if something goes wrong.
-  #
-  # @param [#to_s] directory to use as '/' for SCR calls
-  def set_root_path(directory)
-    check_version = false
-    @scr_handle = Yast::WFM.SCROpen("chroot=#{directory}:scr", check_version)
-    raise "Error creating the chrooted scr instance" if @scr_handle < 0
-    Yast::WFM.SCRSetDefault(@scr_handle)
-    # Temporary workaround for bug bnc#891053 in yast2-core
-    # Stubs all calls to target.yast2 until the bug is fixed
-    allow(Yast::SCR).to receive(:Read).with(YAST2_PATH, anything) do |*args|
-      Yast::SCR.Read(YCP_PATH, File.join("/data", args[1]))
-    end
-  end
-
-  # Resets the SCR calls to default behaviour, closing the SCR instance open by
-  # #set_root_path.
-  #
-  # Raises an exception if #set_root_path has not been called before (or if the
-  # corresponding instance has already been closed)
-  #
-  # @see #set_root_path
-  def reset_root_path
-    default_handle = Yast::WFM.SCRGetDefault
-    if default_handle != @scr_handle
-      raise "Error closing the chrooted scr instance, it's not the current 
default one"
-    end
-    @scr_handle = nil
-    Yast::WFM.SCRClose(default_handle)
-  end
-
   # Stub calls to .target.size (used to check for the presence of a file)
   #
   # @param file to 'simulate'
   def stub_presence_of(file)
     # Returning any value > 0 will suffice
-    allow(Yast::SCR).to receive(:Read).with(SIZE_PATH, file).and_return(256)
+    allow(Yast::SCR).to receive(:Read).with(path(".target.size"), file)
+      .and_return(256)
   end
 
   # Defines an expectation about executing commands using SCR.Execute and
@@ -80,7 +41,7 @@
   # @return [MessageExpectation] an expectation (that can be further customized
   #       with usual RSpec methods)
   def expect_to_execute(command)
-    expect(Yast::SCR).to(receive(:Execute).with(BASH_PATH, command))
+    expect(Yast::SCR).to(receive(:Execute).with(path(".target.bash"), command))
   end
 
   # Stub all calls to SCR.Write storing the value for future comparison
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/keyboard_test.rb 
new/yast2-country-3.1.19/keyboard/test/keyboard_test.rb
--- old/yast2-country-3.1.18/keyboard/test/keyboard_test.rb     2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/keyboard_test.rb     2015-02-16 
13:59:13.000000000 +0100
@@ -12,7 +12,7 @@
   import "AsciiFile"
   import "XVersion"
 
-  RSpec.configure do |c|
+  ::RSpec.configure do |c|
     c.include SCRStub
   end
 
@@ -36,7 +36,9 @@
         # Stub the configuration writing...
         stub_scr_write
         # ...but allow the dump_xkbctrl helper to use SCR.Write
-        allow(SCR).to receive(:Write).with(SCRStub::STRING_PATH, anything, 
anything).and_call_original
+        allow(SCR).to receive(:Write)
+          .with(path(".target.string"), anything, anything).and_call_original
+        allow(SCR).to 
receive(:Read).with(path(".probe.keyboard.manual")).and_return([])
       end
 
       context "during installation" do
@@ -165,9 +167,9 @@
           rule = "# Generated by Yast to handle the layout of keyboards 
connected during installation\n"
           rule += 'ENV{ID_INPUT_KEYBOARD}=="1", ENV{XKBLAYOUT}="es", 
ENV{XKBMODEL}="microsoftpro", ENV{XKBVARIANT}="basic"'
           file = "/usr/lib/udev/rules.d/70-installation-keyboard.rules"
-          expect(SCR).to receive(:Execute).with(SCRStub::REMOVE_PATH, file)
-          expect(SCR).to receive(:Write).with(SCRStub::STRING_PATH, file, 
"#{rule}\n")
-          expect(SCR).to receive(:Write).with(SCRStub::STRING_PATH, file, nil)
+          expect(SCR).to receive(:Execute).with(path(".target.remove"), file)
+          expect(SCR).to receive(:Write).with(path(".target.string"), file, 
"#{rule}\n")
+          expect(SCR).to receive(:Write).with(path(".target.string"), file, 
nil)
 
           Keyboard.SetKeyboard("spanish")
           Keyboard.SetX11("spanish")
@@ -186,8 +188,9 @@
           end
           expect_to_execute(/setxkbmap .*layout tr/)
 
-          expect(SCR).to_not receive(:Execute).with(SCRStub::REMOVE_PATH, 
anything)
-          expect(SCR).to_not receive(:Write).with(SCRStub::STRING_PATH,
+          expect(SCR).to_not receive(:Execute)
+            .with(path(".target.remove"), anything)
+          expect(SCR).to_not receive(:Write).with(path(".target.string"),
                                                   
"/etc/udev/rules.d/70-keyboard.rules",
                                                   anything)
           Keyboard.SetKeyboard("turkish")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/keyboard/test/test_helper.rb 
new/yast2-country-3.1.19/keyboard/test/test_helper.rb
--- old/yast2-country-3.1.18/keyboard/test/test_helper.rb       2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/keyboard/test/test_helper.rb       2015-02-16 
13:59:13.000000000 +0100
@@ -1,8 +1,8 @@
-require 'rspec'
+require_relative "../../test/test_helper.rb"
+require "fileutils"
+
 SRC_PATH = File.expand_path("../../src", __FILE__)
 DATA_PATH = File.join(File.expand_path(File.dirname(__FILE__)), "data")
-ENV["Y2DIR"] = SRC_PATH
-require "yast"
 
 # Used to Emulate the behaviour of
 # /usr/sbin/xkbctrl xx.map.gz > /tmp/yy/xkbctrl.out
@@ -37,13 +37,13 @@
 ]
 END
   end
-  Yast::SCR.Execute(Yast::Path.new(".target.mkdir"), File.dirname(file))
-  Yast::SCR.Write(Yast::Path.new(".target.string"), file, content)
+  Yast::SCR.Execute(path(".target.mkdir"), File.dirname(file))
+  Yast::SCR.Write(path(".target.string"), file, content)
 end
 
 # Closes the SCR instance open by set_root_path and cleans the chroot
 def cleanup_root_path(directory)
-  reset_root_path
+  reset_scr_root
   FileUtils.rmtree(File.join(DATA_PATH, directory, "tmp"))
   FileUtils.rmtree(File.join(DATA_PATH, directory, "data"))
 end
@@ -55,7 +55,7 @@
   FileUtils.cp_r(File.join(SRC_PATH, "data"), File.join(DATA_PATH, directory))
   # chroot SCR
   root = File.join(DATA_PATH, directory)
-  set_root_path(root)
+  change_scr_root(root)
   # In its current implementation import cannot be safelly loaded
   # without the previous mocking and chrooting
   import_keyboard
@@ -66,7 +66,8 @@
 # In most situations, Yast.import "Keyboard" will call Keyboard:Restore(),
 # which calls xkbctrl and Encoding.Restore, so we need to catch both
 def import_keyboard
-  allow(Yast::SCR).to receive(:Execute).with(SCRStub::BASH_PATH, /xkbctrl 
es\.map\.gz/)
+  allow(Yast::SCR).to receive(:Execute)
+    .with(path(".target.bash"), /xkbctrl es\.map\.gz/)
   # Just to prevent a not relevant call to 'locale -k"
   allow(Yast::Encoding).to receive(:Restore)
   Yast.import "Keyboard"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/package/yast2-country.changes 
new/yast2-country-3.1.19/package/yast2-country.changes
--- old/yast2-country-3.1.18/package/yast2-country.changes      2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/package/yast2-country.changes      2015-02-16 
13:59:13.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Feb 13 14:40:53 UTC 2015 - [email protected]
+
+- Propose local time when running in a VMware VM, do not display
+  a warning when local time is selected (bnc#773323)
+- 3.1.19
+
+-------------------------------------------------------------------
 Wed Feb 11 13:49:10 UTC 2015 - [email protected]
 
 - Fixed a crash while setting locale. It attempted to update the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/package/yast2-country.spec 
new/yast2-country-3.1.19/package/yast2-country.spec
--- old/yast2-country-3.1.18/package/yast2-country.spec 2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/package/yast2-country.spec 2015-02-16 
13:59:13.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        3.1.18
+Version:        3.1.19
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -31,6 +31,13 @@
 BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2 
yast2-perl-bindings
 BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  polkit-devel
+# For tests
+BuildRequires:  rubygem(rspec)
+# Fix to bnc#891053 (proper reading of ".target.yast2" on chroots)
+BuildRequires:  yast2-core >= 3.1.12
+# RSpec extensions for YaST
+BuildRequires:  yast2-ruby-bindings >= 3.1.26
+
 Requires:      yast2-trans-stats yast2-perl-bindings timezone
 # XVersion.ycp
 # Message.updating_configuration, Message.takes_a_while
@@ -43,6 +50,8 @@
 Conflicts:     yast2-ntp-client < 2.18.0
 # wrapper_storage.ycp
 Requires:       yast2-packager >= 2.23.3
+# VMware detection (.probe.is_vmware)
+Requires:       yast2-hardware-detection >= 3.1.6
 
 Requires:      yast2-country-data
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/test/test_helper.rb 
new/yast2-country-3.1.19/test/test_helper.rb
--- old/yast2-country-3.1.18/test/test_helper.rb        1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/test/test_helper.rb        2015-02-16 
13:59:13.000000000 +0100
@@ -0,0 +1,24 @@
+root_location = File.expand_path("../../", __FILE__)
+inc_dirs = Dir.glob("#{root_location}/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")
+
+require "yast"
+require "rspec"
+require "yast/rspec"
+
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start
+
+  # for correct coverage report we need to load all ruby files
+  Dir["#{root_location}/*/src/{module,include,lib}/**/*.rb"].each { |f| 
require_relative f }
+
+  # use coveralls for on-line code coverage reporting at Travis CI
+  if ENV["TRAVIS"]
+    require "coveralls"
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+  end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/timezone/Makefile.am 
new/yast2-country-3.1.19/timezone/Makefile.am
--- old/yast2-country-3.1.18/timezone/Makefile.am       2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/Makefile.am       2015-02-16 
13:59:13.000000000 +0100
@@ -1,4 +1,4 @@
 #
 # Makefile.am for country/timezone
-SUBDIRS = doc src testsuite
+SUBDIRS = doc src testsuite test
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-country-3.1.18/timezone/src/clients/timezone_proposal.rb 
new/yast2-country-3.1.19/timezone/src/clients/timezone_proposal.rb
--- old/yast2-country-3.1.18/timezone/src/clients/timezone_proposal.rb  
2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/clients/timezone_proposal.rb  
2015-02-16 13:59:13.000000000 +0100
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-# File:                timezone_proposal.ycp
-#
-# $Id$
+# File:                timezone_proposal.rb
 #
 # Author:              Klaus Kaempf <[email protected]>
 #
@@ -28,15 +26,7 @@
         @force_reset = Ops.get_boolean(@param, "force_reset", false)
         @language_changed = Ops.get_boolean(@param, "language_changed", false)
 
-        @m = Convert.to_map(
-          SCR.Execute(path(".target.bash_output"), "/bin/date +%Y")
-        )
-        Builtins.y2milestone("date call: %1", @m)
-
-        if Ops.less_than(
-            Builtins.tointeger(Ops.get_string(@m, "stdout", "0")),
-            2004
-          )
+        if Time.now < File.stat(__FILE__).mtime
           Ops.set(@ret, "raw_proposal", [])
           @m2 = Convert.to_map(
             SCR.Execute(path(".target.bash_output"), "/bin/date")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-country-3.1.18/timezone/src/include/timezone/dialogs.rb 
new/yast2-country-3.1.19/timezone/src/include/timezone/dialogs.rb
--- old/yast2-country-3.1.18/timezone/src/include/timezone/dialogs.rb   
2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/include/timezone/dialogs.rb   
2015-02-16 13:59:13.000000000 +0100
@@ -859,7 +859,8 @@
           if !utc_only
             @hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc : 
:hwclock_localtime
 
-            if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime
+            vmware = SCR.Read(path(".probe.is_vmware"))
+            if !Timezone.windows_partition && !vmware && @hwclock_s == 
:hwclock_localtime
               if ! confirm_local_time
                 ret = :not_next
                 next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-country-3.1.18/timezone/src/modules/Timezone.rb 
new/yast2-country-3.1.19/timezone/src/modules/Timezone.rb
--- old/yast2-country-3.1.18/timezone/src/modules/Timezone.rb   2015-02-11 
16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/src/modules/Timezone.rb   2015-02-16 
13:59:13.000000000 +0100
@@ -655,7 +655,8 @@
     # Based on current hardware configuration:
     # Win partitions present or 32bit Mac
     def ProposeLocaltime
-      @windows_partition || Arch.board_mac && Arch.ppc32
+      vmware = SCR.Read(path(".probe.is_vmware"))
+      @windows_partition || vmware || (Arch.board_mac && Arch.ppc32)
     end
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/Makefile.am 
new/yast2-country-3.1.19/timezone/test/Makefile.am
--- old/yast2-country-3.1.18/timezone/test/Makefile.am  1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/Makefile.am  2015-02-16 
13:59:13.000000000 +0100
@@ -0,0 +1,6 @@
+TESTS = \
+  Timezone_test.rb
+TEST_EXTENSIONS = .rb
+RB_LOG_COMPILER = rspec
+VERBOSE = 1
+EXTRA_DIST = $(TESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/Timezone_test.rb 
new/yast2-country-3.1.19/timezone/test/Timezone_test.rb
--- old/yast2-country-3.1.18/timezone/test/Timezone_test.rb     1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/Timezone_test.rb     2015-02-16 
13:59:13.000000000 +0100
@@ -0,0 +1,47 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "Timezone"
+
+describe Yast::Timezone do
+
+  describe "#ProposeLocaltime" do
+    subject { Yast::Timezone.ProposeLocaltime }
+
+    it "returns true if a Windows partition is found" do
+      Yast::Timezone.windows_partition = true
+      allow(Yast::SCR).to receive(:Read)
+        .with(path(".probe.is_vmware")).and_return(false)
+
+      expect(subject).to eq(true)
+
+      Yast::Timezone.windows_partition = false
+    end
+
+    it "returns true if running in VMware VM" do
+      expect(Yast::SCR).to receive(:Read)
+        .with(path(".probe.is_vmware")).and_return(true)
+
+      expect(subject).to eq(true)
+    end
+
+    it "returns true if running in on a 32bit Mac" do
+      allow(Yast::SCR).to receive(:Read)
+        .with(path(".probe.is_vmware")).and_return(false)
+      expect(Yast::Arch).to receive(:ppc32).and_return(true)
+      expect(Yast::Arch).to receive(:board_mac).and_return(true)
+
+      expect(subject).to eq(true)
+    end
+
+    it "returns false otherwise" do
+      allow(Yast::SCR).to receive(:Read)
+        .with(path(".probe.is_vmware")).and_return(false)
+      expect(Yast::Arch).to receive(:board_mac).and_return(false)
+
+      expect(subject).to eq(false)
+    end
+    
+  end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-country-3.1.18/timezone/test/test_helper.rb 
new/yast2-country-3.1.19/timezone/test/test_helper.rb
--- old/yast2-country-3.1.18/timezone/test/test_helper.rb       1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/test/test_helper.rb       2015-02-16 
13:59:13.000000000 +0100
@@ -0,0 +1 @@
+require_relative "../../test/test_helper.rb"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.out 
new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.out
--- old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.out  
2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.out  
2015-02-16 13:59:13.000000000 +0100
@@ -1,4 +1,5 @@
 Read   .etc.adjtime ["0", "0", "UTC"]
+Read   .probe.is_vmware false
 Read   .target.yast2 "timezone_raw.ycp" 
[$["entries":$["Europe/Berlin":"Germany", "Europe/Prague":"Czech Republic"], 
"name":"Europe"]]
 Execute        .target.bash_output "/usr/sbin/zic -l Europe/Prague" $[]
 Execute        .target.bash_output "/bin/systemctl try-restart 
systemd-timedated.service" $[]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.rb 
new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.rb
--- old/yast2-country-3.1.18/timezone/testsuite/tests/MakeProposal.rb   
2015-02-11 16:34:09.000000000 +0100
+++ new/yast2-country-3.1.19/timezone/testsuite/tests/MakeProposal.rb   
2015-02-16 13:59:13.000000000 +0100
@@ -28,7 +28,7 @@
       Yast.import "Timezone"
 
       @R = {
-        "probe"  => { "architecture" => "i386" },
+        "probe"  => { "architecture" => "i386", "is_vmware" => false },
         "target" => {
           "yast2" => [
             {

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to