Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-packager -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-03-21 15:22:04.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-04-11 16:27:34.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 11 16:07:19 CEST 2014 - locilka@suse.cz + +- Test for Packages rewritten in RSpec to fix the build +- 3.1.9 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:36201 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.8.tar.bz2 New: ---- yast2-packager-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.NKc9ug/_old 2014-04-14 11:35:22.000000000 +0200 +++ /var/tmp/diff_new_pack.NKc9ug/_new 2014-04-14 11:35:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,6 +28,7 @@ License: GPL-2.0+ BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem-rspec # HwDetection BuildRequires: yast2 >= 3.1.19 ++++++ yast2-packager-3.1.8.tar.bz2 -> yast2-packager-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.8/package/yast2-packager.changes new/yast2-packager-3.1.9/package/yast2-packager.changes --- old/yast2-packager-3.1.8/package/yast2-packager.changes 2014-03-19 18:09:19.000000000 +0100 +++ new/yast2-packager-3.1.9/package/yast2-packager.changes 2014-04-14 09:58:45.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 11 16:07:19 CEST 2014 - locilka@suse.cz + +- Test for Packages rewritten in RSpec to fix the build +- 3.1.9 + +------------------------------------------------------------------- Wed Mar 19 16:26:51 UTC 2014 - lslezak@suse.cz - copy libzypp credentials to the target system before starting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.8/package/yast2-packager.spec new/yast2-packager-3.1.9/package/yast2-packager.spec --- old/yast2-packager-3.1.8/package/yast2-packager.spec 2014-03-19 18:09:19.000000000 +0100 +++ new/yast2-packager-3.1.9/package/yast2-packager.spec 2014-04-14 09:58:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,6 +28,7 @@ License: GPL-2.0+ BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem-rspec # HwDetection BuildRequires: yast2 >= 3.1.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.8/test/Makefile.am new/yast2-packager-3.1.9/test/Makefile.am --- old/yast2-packager-3.1.8/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.9/test/Makefile.am 2014-04-14 09:58:45.000000000 +0200 @@ -0,0 +1,7 @@ +TESTS = \ + packages_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-packager-3.1.8/test/packages_test.rb new/yast2-packager-3.1.9/test/packages_test.rb --- old/yast2-packager-3.1.8/test/packages_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.9/test/packages_test.rb 2014-04-14 09:58:45.000000000 +0200 @@ -0,0 +1,70 @@ +#! /usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +Yast.import "Packages" +Yast.import "SCR" +Yast.import "Product" + +describe Yast::Packages do + describe "#kernelCmdLinePackages" do + before(:each) do + # default value + Yast::SCR.stub(:Read).and_return(nil) + Yast::Product.stub(:Product).and_return(nil) + end + + SCR_STRING_PATH = Yast::Path.new(".target.string") + SCR_BASH_PATH = Yast::Path.new(".target.bash") + + CHECK_FOR_DELL_SYSTEM = Regexp.new( + 'hwinfo .*bios .*grep .*vendor:.*dell inc', + Regexp::IGNORECASE + ) + + context "when biosdevname behavior explicitly defined on the Kenel command line" do + it "returns biosdevname within the list of required packages" do + Yast::SCR.stub(:Read).with( + SCR_STRING_PATH,"/proc/cmdline" + ).and_return("install=cd:// vga=0x314 biosdevname=1") + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true + end + + it "does not return biosdevname within the list of required packages" do + Yast::SCR.stub(:Read).with( + SCR_STRING_PATH,"/proc/cmdline" + ).and_return("install=cd:// vga=0x314 biosdevname=0") + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false + end + end + + context "when biosdevname behavior not defined on the Kernel command line" do + context "and running on a Dell system" do + it "returns biosdevname within the list of packages" do + Yast::SCR.stub(:Read).with( + Yast::Path.new(".target.string"), + "/proc/cmdline" + ).and_return("install=cd:// vga=0x314") + # 0 means `grep` succeeded + Yast::SCR.stub(:Execute).with(SCR_BASH_PATH, CHECK_FOR_DELL_SYSTEM).and_return(0) + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true + end + end + + context "and running on a non-Dell system" do + it "does not return biosdevname within the list of packages" do + Yast::SCR.stub(:Read).with( + Yast::Path.new(".target.string"), + "/proc/cmdline" + ).and_return("install=cd:// vga=0x314") + # 1 means `grep` has not succeeded + Yast::SCR.stub(:Execute).with(SCR_BASH_PATH, CHECK_FOR_DELL_SYSTEM).and_return(1) + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_false + end + end + end + + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.8/testsuite/tests/Packages.out new/yast2-packager-3.1.9/testsuite/tests/Packages.out --- old/yast2-packager-3.1.8/testsuite/tests/Packages.out 2014-03-19 18:09:20.000000000 +0100 +++ new/yast2-packager-3.1.9/testsuite/tests/Packages.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Read .target.tmpdir "/tmp" -Read .target.stat "/y2update/control.xml" $["isreg":true] -Read .target.size "/y2update/control.xml" 1 -Read .xml "/y2update/control.xml" $[] -Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" -Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] -Read .sysconfig.language.RC_LANG "en_US.UTF-8" -Read .target.size "/etc/sysconfig/language" 1 -Read .sysconfig.language.ROOT_USES_LANG "ctype" -Read .sysconfig.language.RC_LANG "en_US.UTF-8" -Read .sysconfig.language.INSTALLED_LANGUAGES "" -Dump ----- biosdevname tests ----- -Read .target.string "/proc/cmdline" "install=cd:// vga=0x314 biosdevname=1" -Return ["biosdevname"] -Read .target.string "/proc/cmdline" "install=cd:// vga=0x314 biosdevname=0" -Return [] -Read .target.string "/proc/cmdline" "install=cd:// vga=0x314" -Execute .target.bash "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell Inc\\.'" 0 -Return ["biosdevname"] -Read .target.string "/proc/cmdline" "install=cd:// vga=0x314" -Execute .target.bash "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell Inc\\.'" 1 -Return [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.8/testsuite/tests/Packages.rb new/yast2-packager-3.1.9/testsuite/tests/Packages.rb --- old/yast2-packager-3.1.8/testsuite/tests/Packages.rb 2014-03-19 18:09:20.000000000 +0100 +++ new/yast2-packager-3.1.9/testsuite/tests/Packages.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -# encoding: utf-8 - -# Testsuite for Packages.ycp module -# -module Yast - class PackagesClient < Client - def main - Yast.include self, "testsuite.rb" - - # huh, we need to mock too much paths because of some module constructor... :-( - @READ = { - "target" => { - "tmpdir" => "/tmp", - "size" => 1, - "stat" => { "isreg" => true } - }, - "xml" => {}, - "sysconfig" => { - "language" => { - "RC_LANG" => "en_US.UTF-8", - "ROOT_USES_LANG" => "ctype", - "RC_LANG" => "en_US.UTF-8", - "INSTALLED_LANGUAGES" => "" - }, - "console" => { "CONSOLE_ENCODING" => "UTF-8" } - } - } - - @EXEC = { - "target" => { - "bash_output" => { "exit" => 0, "stdout" => "charmap=\"UTF-8\"\n" } - } - } - - TESTSUITE_INIT([@READ, {}, @EXEC], nil) - - Yast.import "Packages" - - - - DUMP(" ----- biosdevname tests ----- ") - - # explicitly enable - Ops.set( - @READ, - ["target", "string"], - "install=cd:// vga=0x314 biosdevname=1" - ) - TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) - - # explicitly disable - Ops.set( - @READ, - ["target", "string"], - "install=cd:// vga=0x314 biosdevname=0" - ) - TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) - - - # autodetection, no biosdevname=0|1 boot option - Ops.set(@READ, ["target", "string"], "install=cd:// vga=0x314") - - # a Dell system - Ops.set( - @EXEC, - ["target", "bash"], - 0 - ) - TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) - - # a non-Dell system - Ops.set( - @EXEC, - ["target", "bash"], - 1 - ) - TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil) - - nil - end - end -end - -Yast::PackagesClient.new.main continue with "q"... Checked in at Mon Apr 14 11:36:09 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org