Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-04-05 14:43:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2014-03-27 06:17:20.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-04-05 14:43:14.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Apr 3 12:15:49 UTC 2014 - [email protected]
+
+- do not write network configuration from upgrade to system
+ (bnc#871178)
+- 3.1.62
+
+-------------------------------------------------------------------
+Wed Apr 2 09:25:38 UTC 2014 - [email protected]
+
+- remove ssh_service_finish as it is handle in
+ firewall_stage1_finish due to split of ssh port open and sshd
+ enablement (bnc#865056)
+- 3.1.61
+
+-------------------------------------------------------------------
+Sun Mar 30 17:15:03 UTC 2014 - [email protected]
+
+- bnc#869719
+ - fixed parameters forcing manual network configuration on user's
+ request at disks activation screen
+- 3.1.60
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.59.tar.bz2
New:
----
yast2-installation-3.1.62.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.SWC6Pp/_old 2014-04-05 14:43:15.000000000 +0200
+++ /var/tmp/diff_new_pack.SWC6Pp/_new 2014-04-05 14:43:15.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.59
+Version: 3.1.62
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.59.tar.bz2 -> yast2-installation-3.1.62.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/package/yast2-installation.changes
new/yast2-installation-3.1.62/package/yast2-installation.changes
--- old/yast2-installation-3.1.59/package/yast2-installation.changes
2014-03-25 11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/package/yast2-installation.changes
2014-04-04 09:49:48.000000000 +0200
@@ -1,4 +1,27 @@
-------------------------------------------------------------------
+Thu Apr 3 12:15:49 UTC 2014 - [email protected]
+
+- do not write network configuration from upgrade to system
+ (bnc#871178)
+- 3.1.62
+
+-------------------------------------------------------------------
+Wed Apr 2 09:25:38 UTC 2014 - [email protected]
+
+- remove ssh_service_finish as it is handle in
+ firewall_stage1_finish due to split of ssh port open and sshd
+ enablement (bnc#865056)
+- 3.1.61
+
+-------------------------------------------------------------------
+Sun Mar 30 17:15:03 UTC 2014 - [email protected]
+
+- bnc#869719
+ - fixed parameters forcing manual network configuration on user's
+ request at disks activation screen
+- 3.1.60
+
+-------------------------------------------------------------------
Mon Mar 24 14:48:36 UTC 2014 - [email protected]
- change cio_ignore kernel parameter according to kernel changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/package/yast2-installation.spec
new/yast2-installation-3.1.62/package/yast2-installation.spec
--- old/yast2-installation-3.1.59/package/yast2-installation.spec
2014-03-25 11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/package/yast2-installation.spec
2014-04-04 09:49:48.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.59
+Version: 3.1.62
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.59/src/Makefile.am
new/yast2-installation-3.1.62/src/Makefile.am
--- old/yast2-installation-3.1.59/src/Makefile.am 2014-03-25
11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/Makefile.am 2014-04-04
09:49:48.000000000 +0200
@@ -63,7 +63,6 @@
clients/random_finish.rb \
clients/save_config_finish.rb \
clients/save_hw_status_finish.rb \
- clients/ssh_service_finish.rb \
clients/ssh_settings_finish.rb \
clients/stroj-casu.rb \
clients/switch_scr_finish.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/src/clients/inst_disks_activate.rb
new/yast2-installation-3.1.62/src/clients/inst_disks_activate.rb
--- old/yast2-installation-3.1.59/src/clients/inst_disks_activate.rb
2014-03-25 11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/clients/inst_disks_activate.rb
2014-04-04 09:49:48.000000000 +0200
@@ -144,7 +144,7 @@
WFM.call("inst_fcoe-client", [@argmap])
@ret = :redraw
when :network
- WFM.call("inst_lan", [@argmap])
+ WFM.call("inst_lan", [@argmap.merge({"skip_detection" => true})])
@ret = :redraw
end
if @ret == :redraw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.59/src/clients/inst_finish.rb
new/yast2-installation-3.1.62/src/clients/inst_finish.rb
--- old/yast2-installation-3.1.59/src/clients/inst_finish.rb 2014-03-25
11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/clients/inst_finish.rb 2014-04-04
09:49:48.000000000 +0200
@@ -173,7 +173,6 @@
"firewall_stage1",
"ntp-client",
"ssh_settings",
- "ssh_service",
"save_hw_status",
"users",
"autoinst_scripts2",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/src/clients/network_finish.rb
new/yast2-installation-3.1.62/src/clients/network_finish.rb
--- old/yast2-installation-3.1.59/src/clients/network_finish.rb 2014-03-25
11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/clients/network_finish.rb 2014-04-04
09:49:48.000000000 +0200
@@ -67,7 +67,7 @@
"steps" => 1,
# progress step title
"title" => _("Saving network configuration..."),
- "when" => [:installation, :update, :autoinst]
+ "when" => [:installation, :autoinst]
}
elsif @func == "Write"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/src/clients/ssh_service_finish.rb
new/yast2-installation-3.1.62/src/clients/ssh_service_finish.rb
--- old/yast2-installation-3.1.59/src/clients/ssh_service_finish.rb
2014-03-25 11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/clients/ssh_service_finish.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
-#
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail, you may
find
-# current contact information at www.novell.com.
-#
------------------------------------------------------------------------------
-
-# File:
-# ssh_service_finish.ycp
-#
-# Module:
-# Step of base installation finish
-#
-# Author:
-# Bubli <[email protected]>
-#
-# $Id: ssh_service_finish.ycp 54888 2009-01-22 11:47:19Z locilka $
-#
-module Yast
- class SshServiceFinishClient < Client
- def main
-
- textdomain "installation"
-
- Yast.import "Linuxrc"
- Yast.import "Service"
-
-
- @ret = nil
- @func = ""
- @param = {}
-
- # Check arguments
- if Ops.greater_than(Builtins.size(WFM.Args), 0) &&
- Ops.is_string?(WFM.Args(0))
- @func = Convert.to_string(WFM.Args(0))
- if Ops.greater_than(Builtins.size(WFM.Args), 1) &&
- Ops.is_map?(WFM.Args(1))
- @param = Convert.to_map(WFM.Args(1))
- end
- end
-
- Builtins.y2milestone("starting ssh_service_finish")
- Builtins.y2debug("func=%1", @func)
- Builtins.y2debug("param=%1", @param)
-
- if @func == "Info"
- return {
- "steps" => 1,
- # progress step title
- "title" => _(
- "Enabling SSH service on installed system..."
- ),
- "when" => Linuxrc.usessh || Linuxrc.vnc ?
- [:installation, :autoinst] :
- []
- }
- elsif @func == "Write"
- Builtins.y2milestone(
- "SSH service will be enabled, this is SSH/VNC installation"
- )
- Service.Enable("sshd")
- else
- Builtins.y2error("unknown function: %1", @func)
- @ret = nil
- end
-
- Builtins.y2debug("ret=%1", @ret)
- Builtins.y2milestone("ssh_service_finish finished")
- deep_copy(@ret)
- end
- end
-end
-
-Yast::SshServiceFinishClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/src/modules/ImageInstallation.rb
new/yast2-installation-3.1.62/src/modules/ImageInstallation.rb
--- old/yast2-installation-3.1.59/src/modules/ImageInstallation.rb
2014-03-25 11:35:02.000000000 +0100
+++ new/yast2-installation-3.1.62/src/modules/ImageInstallation.rb
2014-04-04 09:49:48.000000000 +0200
@@ -36,6 +36,8 @@
module Yast
class ImageInstallationClass < Module
+ include Yast::Logger
+
def main
Yast.import "UI"
Yast.import "Pkg"
@@ -139,6 +141,9 @@
"steps_reserved" => 10
}
}
+
+ # Images selected by FindImageSet()
+ @selected_images = {}
end
# Set the repository to get images from
@@ -886,7 +891,7 @@
# trying to find all matching patterns
Builtins.foreach(image_sets) do |image|
- pattern = Ops.get_string(image, "patterns", "")
+ pattern = image["patterns"]
imageset_patterns = Builtins.splitstring(pattern, ", ")
Ops.set(
patterns_in_imagesets,
@@ -917,11 +922,7 @@
end
end
- Builtins.y2debug(
- "Matching patterns: %1, sizes: %2",
- possible_patterns,
- matching_patterns
- )
+ log.info "Matching patterns: #{possible_patterns}, sizes:
#{matching_patterns}"
# selecting the best imageset
last_pattern = ""
@@ -957,6 +958,7 @@
end
Builtins.y2milestone("Result: %1/%2", last_pattern, result)
+ @selected_images = result
# No matching pattern
if result == {}
@@ -1486,10 +1488,16 @@
@_image_order = []
@images_details = {}
@_mounted_images = []
+ @selected_images = {}
nil
end
+ # Only for checking in tests now
+ def selected_images
+ @selected_images
+ end
+
publish :function => :SetRepo, :type => "void (integer)"
publish :variable => :last_patterns_selected, :type => "list <string>"
publish :variable => :changed_by_user, :type => "boolean"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/test/data/images/images.xml
new/yast2-installation-3.1.62/test/data/images/images.xml
--- old/yast2-installation-3.1.59/test/data/images/images.xml 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.62/test/data/images/images.xml 2014-04-04
09:49:48.000000000 +0200
@@ -0,0 +1,346 @@
+<?xml version="1.0"?>
+<!DOCTYPE images>
+<image_installation xmlns="http://www.suse.com/1.0/yast2ns";
xmlns:config="http://www.suse.com/1.0/configns";>
+<image_sets config:type="list" >
+ <!-- Example taken from openSUSE 13.1 GM -->
+ <image_set>
+
<patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>kde-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+
<patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>gnome-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>i386</archs>
+ <pkg_image>base-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>i386</archs>
+ <pkg_image>x11-meta-i386.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-i386.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-i386.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+
<patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>kde-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+
<patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>gnome-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>base-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>x86_64</archs>
+ <pkg_image>x11-meta-x86_64.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-x86_64.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-x86_64.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+
<patterns>base,enhanced_base,games,imaging,kde4,kde4_basis,multimedia,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>kde-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>KDE [base]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [xorg]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [desktop]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE</name>
+ <type>tar</type>
+ <file>kde-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>KDE [meta]</name>
+ <type>tar</type>
+ <file>kde-meta-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+
<patterns>base,enhanced_base,fonts,games,gnome,gnome_basis,imaging,multimedia,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>gnome-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>GNOME [1]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [2]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [4]</name>
+ <type>tar</type>
+ <file>common-desktop-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME</name>
+ <type>tar</type>
+ <file>gnome-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>GNOME [meta]</name>
+ <type>tar</type>
+ <file>gnome-meta-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,sw_management</patterns>
+ <archs>ppc</archs>
+ <pkg_image>base-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>BASE [1]</name>
+ <type>tar</type>
+ <file>base-meta-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [2]</name>
+ <type>tar</type>
+ <file>base-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>BASE [3]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+ <image_set>
+ <patterns>base,enhanced_base,fonts,sw_management,x11</patterns>
+ <archs>ppc</archs>
+ <pkg_image>x11-meta-ppc.tar.xz</pkg_image>
+ <images config:type="list">
+ <image>
+ <name>X11 [1]</name>
+ <type>tar</type>
+ <file>x11-meta-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [2]</name>
+ <type>tar</type>
+ <file>x11-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [3]</name>
+ <type>tar</type>
+ <file>common-xorg-ppc.tar.xz</file>
+ </image>
+ <image>
+ <name>X11 [4]</name>
+ <type>tar</type>
+ <file>common-base-ppc.tar.xz</file>
+ </image>
+ </images>
+ </image_set>
+</image_sets>
+</image_installation>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.59/test/image_installation_test.rb
new/yast2-installation-3.1.62/test/image_installation_test.rb
--- old/yast2-installation-3.1.59/test/image_installation_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.62/test/image_installation_test.rb
2014-04-04 09:49:48.000000000 +0200
@@ -0,0 +1,71 @@
+#! /usr/bin/env rspec
+
+require_relative "./test_helper"
+
+Yast.import "ImageInstallation"
+Yast.import "Installation"
+
+# For mocking
+Yast.import "Pkg"
+Yast.import "Arch"
+
+IMAGES_DESCR_FILE = File.join(File.expand_path(File.dirname(__FILE__)),
"data/images/images.xml")
+
+KDE4_PATTERNS =
["base","enhanced_base","games","imaging","kde4","kde4_basis","multimedia","sw_management","x11"]
+GNOME_PATTERNS =
["base","enhanced_base","fonts","games","gnome","gnome_basis","imaging","multimedia","sw_management","x11"]
+X11_PATTERNS = ["base","enhanced_base","fonts","sw_management","x11"]
+BASE_PATTERNS = ["base","enhanced_base","sw_management"]
+
+NON_MATCHING_PATTERNS_1 = ["games", "gnome_basis"]
+NON_MATCHING_PATTERNS_2 = ["enhanced_base"]
+
+NON_MATCHING_ARCH = "unsupported"
+
+ARCHS = ["i386", "x86_64", "ppc"]
+
+describe Yast::ImageInstallation do
+ describe "#FindImageSet" do
+ before(:each) do
+ Yast::Pkg.stub(:SourceProvideDigestedFile).and_return(IMAGES_DESCR_FILE)
+ end
+
+ it "finds images matching architecture and selected patterns and returns
if processing was successful" do
+ ARCHS.each do |arch|
+ Yast::Arch.stub(:arch_short).and_return(arch)
+
+ [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do
|patterns|
+ Yast::ImageInstallation.FreeInternalVariables()
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_true
+ expect(Yast::ImageInstallation.selected_images["archs"]).to eq(arch)
+ end
+ end
+ end
+
+ it "does not find any image using unsupported architecture and returns if
processing was successful" do
+ [KDE4_PATTERNS, GNOME_PATTERNS, X11_PATTERNS, BASE_PATTERNS].each do
|patterns|
+ Yast::Arch.stub(:arch_short).and_return(NON_MATCHING_ARCH)
+ Yast::ImageInstallation.FreeInternalVariables()
+
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_false
+ expect(Yast::ImageInstallation.selected_images).to be_empty
+ end
+ end
+
+ it "does not find any image using unsupported patterns and returns if
processing was successful" do
+ ARCHS.each do |arch|
+ Yast::Arch.stub(:arch_short).and_return(arch)
+
+ [NON_MATCHING_PATTERNS_2, NON_MATCHING_PATTERNS_2].each do |patterns|
+ Yast::ImageInstallation.FreeInternalVariables()
+
+ expect(Yast::ImageInstallation.FindImageSet(patterns)).to be_true
+ expect(Yast::Installation.image_installation).to be_false
+ expect(Yast::ImageInstallation.selected_images).to be_empty
+ end
+ end
+ end
+
+ end
+end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
