Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at 2016-07-07 15:10:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes
2016-06-13 21:52:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes
2016-07-07 15:10:08.000000000 +0200
@@ -1,0 +2,35 @@
+Wed Jul 6 15:07:59 UTC 2016 - igonzalezs...@suse.com
+
+- Fix remaining estimation during installation (bsc#982138)
+- 3.1.107
+
+-------------------------------------------------------------------
+Wed Jul 6 10:46:54 UTC 2016 - igonzalezs...@suse.com
+
+- Fix remaining packages count during installation (bsc#987791 and
+ bsc#987604)
+- 3.1.106
+
+-------------------------------------------------------------------
+Tue Jun 28 14:15:15 UTC 2016 - jreidin...@suse.com
+
+- optimize slide show size computing to improve installation
+ performance (bnc#986649)
+- 3.1.105
+
+-------------------------------------------------------------------
+Mon Jun 20 08:04:22 UTC 2016 - lsle...@suse.cz
+
+- Restored back the InstURL#GetDevicesOption method which was
+ accidentaly removed in the previous update (bsc#985593)
+- 3.1.104
+
+-------------------------------------------------------------------
+Wed Jun 15 11:07:50 UTC 2016 - igonzalezs...@suse.com
+
+- Allow installation via HTTPS using a self-signed certificate
+ when "ssl_certs=0" boot option is used (bsc#982727)
+- Drop "is_network" method from InstURL module
+- 3.1.103
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-3.1.102.tar.bz2
New:
----
yast2-packager-3.1.107.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.d6bhkN/_old 2016-07-07 15:10:09.000000000 +0200
+++ /var/tmp/diff_new_pack.d6bhkN/_new 2016-07-07 15:10:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.102
+Version: 3.1.107
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-packager-3.1.102.tar.bz2 -> yast2-packager-3.1.107.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/package/yast2-packager.changes
new/yast2-packager-3.1.107/package/yast2-packager.changes
--- old/yast2-packager-3.1.102/package/yast2-packager.changes 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/package/yast2-packager.changes 2016-07-06
17:24:30.000000000 +0200
@@ -1,4 +1,39 @@
-------------------------------------------------------------------
+Wed Jul 6 15:07:59 UTC 2016 - igonzalezs...@suse.com
+
+- Fix remaining estimation during installation (bsc#982138)
+- 3.1.107
+
+-------------------------------------------------------------------
+Wed Jul 6 10:46:54 UTC 2016 - igonzalezs...@suse.com
+
+- Fix remaining packages count during installation (bsc#987791 and
+ bsc#987604)
+- 3.1.106
+
+-------------------------------------------------------------------
+Tue Jun 28 14:15:15 UTC 2016 - jreidin...@suse.com
+
+- optimize slide show size computing to improve installation
+ performance (bnc#986649)
+- 3.1.105
+
+-------------------------------------------------------------------
+Mon Jun 20 08:04:22 UTC 2016 - lsle...@suse.cz
+
+- Restored back the InstURL#GetDevicesOption method which was
+ accidentaly removed in the previous update (bsc#985593)
+- 3.1.104
+
+-------------------------------------------------------------------
+Wed Jun 15 11:07:50 UTC 2016 - igonzalezs...@suse.com
+
+- Allow installation via HTTPS using a self-signed certificate
+ when "ssl_certs=0" boot option is used (bsc#982727)
+- Drop "is_network" method from InstURL module
+- 3.1.103
+
+-------------------------------------------------------------------
Thu Jun 2 09:24:10 UTC 2016 - igonzalezs...@suse.com
- Drop yast2-packager-devel-doc (fate#320356)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.102/package/yast2-packager.spec
new/yast2-packager-3.1.107/package/yast2-packager.spec
--- old/yast2-packager-3.1.102/package/yast2-packager.spec 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/package/yast2-packager.spec 2016-07-06
17:24:30.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.102
+Version: 3.1.107
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.102/src/modules/InstURL.rb
new/yast2-packager-3.1.107/src/modules/InstURL.rb
--- old/yast2-packager-3.1.102/src/modules/InstURL.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/src/modules/InstURL.rb 2016-07-06
17:24:30.000000000 +0200
@@ -12,14 +12,15 @@
module Yast
class InstURLClass < Module
+ include Yast::Logger
+
def main
textdomain "packager"
Yast.import "Linuxrc"
Yast.import "URL"
Yast.import "CheckMedia"
-
- @is_network = true
+ @installInf2Url = nil
end
# Hide Password
@@ -52,9 +53,7 @@
dname != ""
ready = Builtins.add(ready, dname)
end
- end
-
-
+ end
devlist = deep_copy(ready) if Builtins.size(ready) != 0
@@ -142,232 +141,54 @@
# Convert install.inf to a URL useable by the package manager
# @param [String] extra_dir append path to original URL
# @return [String] new repository URL
- def installInf2Url(extra_dir)
- repo_url = ""
+ def installInf2Url(extra_dir = "")
+ return @installInf2Url unless @installInf2Url.nil?
- # bnc #406162
- repo_url_from_inf = false
- Builtins.foreach(["ZyppRepoURL"]) do |in_inf_key|
- repo_url = Linuxrc.InstallInf(in_inf_key)
- if repo_url != nil && repo_url != ""
- Builtins.y2milestone(
- "Using %1 directly from install.inf: %2",
- in_inf_key,
- URL.HidePassword(repo_url)
- )
- repo_url_from_inf = true
- raise Break
- end
- end
+ @installInf2Url = Linuxrc.InstallInf("ZyppRepoURL")
- return repo_url if repo_url_from_inf
-
- # Initial repository hasn't been found in install.inf
- # Trying to guess it ...
- Builtins.y2warning("Initial repository not found in install.inf")
-
- options = ""
- url_tokens = {}
-
- instmode = Linuxrc.InstallInf("InstMode") # mode
- instmode = "cd" if instmode == nil # defaults to "CD"
-
- if instmode == "cd" || # CD or DVD
- instmode == "dvd"
- @is_network = false
- options = GetDevicesOption()
- elsif instmode == "hd" # Harddisk
- @is_network = false
- partition = Linuxrc.InstallInf("Partition")
- if partition != nil
- options = Ops.add(
- Ops.add("device=/dev/", partition),
- "&filesystem=auto"
- )
- else
- Builtins.y2error("no partition specified")
- end
+ if @installInf2Url.to_s.empty?
+ # Make it compatible with the current behaviour when
+ # install.inf does not exist.
+ log.warn "No URL specified through ZyppRepoURL"
+ @installInf2Url = "cd:///"
end
- Ops.set(url_tokens, "scheme", instmode)
-
- if @is_network
- username = Linuxrc.InstallInf("Username")
- if username != nil && username != ""
- Ops.set(url_tokens, "user", username)
- password = Linuxrc.InstallInf("Password")
- if password != nil && password != ""
- Ops.set(url_tokens, "pass", password)
- end
- end
- servername = Linuxrc.InstallInf("ServerName")
- server = Linuxrc.InstallInf("Server")
- serverip = Linuxrc.InstallInf("ServerIP")
-
- if servername != nil && servername != ""
- Ops.set(url_tokens, "host", servername)
- elsif server != nil && server != ""
- Ops.set(url_tokens, "host", server)
- elsif serverip != nil && serverip != ""
- Ops.set(url_tokens, "host", serverip)
- end
- end # is_network
-
- isoimg = ""
- serverdir = Linuxrc.InstallInf("Serverdir")
- if Linuxrc.InstallInf("SourceType") == "file"
- if serverdir != "" && serverdir != nil
- sd_items = Builtins.splitstring(serverdir, "/")
- sd_items = Builtins.filter(sd_items) { |i| i != "" }
- last = Ops.subtract(Builtins.size(sd_items), 1)
- isoimg = Ops.get(sd_items, last, "")
- Ops.set(sd_items, last, "")
- serverdir = Builtins.mergestring(sd_items, "/")
- end
- end
-
- # if (((instmode == "hd") || is_network)
// if serverdir needed
- # && ((serverdir != nil) && (serverdir != "")))
// and is valid
- # {
- # // for smb mounts it is usual to not have a leading slash
- # if (substring (serverdir, 0, 1) != "/")
- # serverdir = "/" + serverdir;
- # }
- share = Linuxrc.InstallInf("Share")
-
- if extra_dir != ""
- if serverdir != nil
- # avoid too many slashes
- if Builtins.findlastof(serverdir, "/") ==
- Ops.subtract(Builtins.size(serverdir), 1)
- serverdir = Builtins.substring(
- serverdir,
- 0,
- Ops.subtract(Builtins.size(serverdir), 1)
- )
- end
-
- slash = ""
- slash = "/" if Builtins.substring(extra_dir, 0, 1) != "/"
- serverdir = Ops.add(Ops.add(serverdir, slash), extra_dir)
- slash = ""
- else
- serverdir = extra_dir
- end
- end
+ # The URL is parsed/build only if needed to avoid potential problems
with corner cases.
+ @installInf2Url = add_extra_dir_to_url(@installInf2Url, extra_dir)
unless extra_dir.empty?
+ @installInf2Url = add_ssl_verify_no_to_url(@installInf2Url) unless
SSLVerificationEnabled()
- if serverdir != nil && serverdir != ""
- fs = ""
- if instmode == "ftp"
- # ftp://foo/%2fbar is %2fbar on foo (relative)
- # ftp://foo/bar is bar on foo (absolute)
- # ftp://foo//bar is /bar on foo (relative)
- # Note: %2f is added by URL.ycp if the path starts with /
- if Builtins.substring(serverdir, 0, 3) == "%2f"
- serverdir = Ops.add("/", Builtins.substring(serverdir, 3))
- end
- fs = serverdir
- elsif instmode == "smb" && share != nil && share != ""
- fs = Ops.add(Ops.add(share, "/"), serverdir)
- else
- fs = serverdir
- end
- Ops.set(url_tokens, "path", fs)
- else
- # FIXME don't know why it is needed
- # Needed as a seperator between URL and options (!)
- # bnc#571648 - smb installation source: linuxrc path failed for YaST
repositories
- if instmode == "smb" && share != nil && share != ""
- Ops.set(url_tokens, "path", Ops.add(share, "/"))
- else
- Ops.set(url_tokens, "path", "/")
- end
- end
-
- port = Linuxrc.InstallInf("Port")
- Ops.set(url_tokens, "port", port) if port != nil && port != ""
-
- url = URL.Build(url_tokens)
- option_separator = "?"
-
- if @is_network
- proxy = Linuxrc.InstallInf("Proxy")
- if proxy != nil && proxy != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "proxy="),
- proxy
- )
- option_separator = "&"
- end
- proxyport = Linuxrc.InstallInf("ProxyPort")
- if proxyport != nil && proxyport != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "proxyport="),
- proxyport
- )
- option_separator = "&"
- end
- proxyproto = Linuxrc.InstallInf("ProxyProto")
- if proxyproto != nil && proxyproto != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "proxyproto="),
- proxyproto
- )
- option_separator = "&"
- end
- proxyuser = Linuxrc.InstallInf("ProxyUser")
- if proxyuser != nil && proxyuser != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "proxyuser="),
- proxyuser
- )
- option_separator = "&"
- end
- proxypassword = Linuxrc.InstallInf("ProxyPassword")
- if proxypassword != nil && proxypassword != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "proxypassword="),
- proxypassword
- )
- option_separator = "&"
- end
- workgroup = Linuxrc.InstallInf("WorkDomain")
- if workgroup != nil && workgroup != ""
- url = Ops.add(
- Ops.add(Ops.add(url, option_separator), "workgroup="),
- workgroup
- )
- option_separator = "&"
- end
-
- if instmode == "https"
- Builtins.y2milestone("HTTPS instmode detected")
-
- if !SSLVerificationEnabled()
- Builtins.y2security(
- "Disabling certificate check for the installation repository"
- )
-
- # libzypp uses ssl_verify=no option
- url = Ops.add(Ops.add(url, option_separator), "ssl_verify=no")
- option_separator = "&"
- end
- end
- end # is_network
+ log.info "Using install URL: #{URL.HidePassword(@installInf2Url)}"
+ @installInf2Url
+ end
- if options != ""
- url = Ops.add(Ops.add(url, option_separator), options)
- option_separator = "&"
- Builtins.y2milestone("options %1", options)
- end
+ private
- url = Builtins.sformat("iso:/?iso=%1&url=%2", isoimg, url) if isoimg !=
""
+ # Helper method to add extra_dir to a given URL
+ #
+ # @param url [String] URL
+ # @param extra_dir [String] Path to add
+ # @return [String] URL with the added path
+ def add_extra_dir_to_url(url, extra_dir)
+ parts = URL.Parse(url)
+ parts["path"] = File.join(parts["path"], extra_dir)
+ URL.Build(parts)
+ end
- Builtins.y2debug("URL %1", URL.HidePassword(url))
- url
+ # Helper method to add ssl_verify parameter if needed
+ #
+ # Only applicable if scheme is 'https'.
+ #
+ # @param url [String] URL
+ # @return [String] URL (with ssl_verify set to 'no' if needed)
+ def add_ssl_verify_no_to_url(url)
+ parts = URL.Parse(url)
+ return url if parts["scheme"].downcase != "https"
+ log.warn "Disabling certificate check for the installation repository"
+ parts["query"] << "&" unless parts["query"].empty?
+ parts["query"] << "ssl_verify=no"
+ URL.Build(parts)
end
- publish :variable => :is_network, :type => "boolean"
publish :function => :HidePassword, :type => "string (string)"
publish :function => :RewriteCDUrl, :type => "string (string)"
publish :function => :installInf2Url, :type => "string (string)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/src/modules/PackageSlideShow.rb
new/yast2-packager-3.1.107/src/modules/PackageSlideShow.rb
--- old/yast2-packager-3.1.102/src/modules/PackageSlideShow.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/src/modules/PackageSlideShow.rb 2016-07-06
17:24:30.000000000 +0200
@@ -8,6 +8,7 @@
# Stanislav Visnovsky <vis...@suse.cz>
#
require "yast"
+require "yast2/system_time"
module Yast
class PackageSlideShowClass < Module
@@ -128,13 +129,10 @@
# Sum up all list items
#
+ # @param sizes [Array<Fixnum>] Sizes to sum
+ # @return [Fixnum] Sizes sum
def ListSum(sizes)
- sizes = deep_copy(sizes)
- sum = 0
-
- Builtins.foreach(sizes) { |item| sum = Ops.add(sum, item) if item != -1 }
-
- sum
+ sizes.reduce(0) { |s, i| i == -1 ? s : s + i }
end
# Sum up all positive list items, but cut off individual items at a
maximum value.
@@ -625,8 +623,10 @@
# @param [Boolean] force_recalc force recalculation even if timeout not
reached yet
# @return true if recalculated, false if not
#
+ # @see SlideShow.next_recalc_time
+ # @see Yast2::SystemTime.uptime
def RecalcRemainingTimes(force_recalc)
- if !force_recalc && ::Time.now.to_i < SlideShow.next_recalc_time
+ if !force_recalc && Yast2::SystemTime.uptime < SlideShow.next_recalc_time
# Nothing to do (yet) - simply return
return false
end
@@ -634,7 +634,7 @@
elapsed = SlideShow.total_time_elapsed
if SlideShow.start_time >= 0
- elapsed += ::Time.now.to_i - SlideShow.start_time
+ elapsed += Yast2::SystemTime.uptime - SlideShow.start_time
end
if elapsed == 0
@@ -702,7 +702,11 @@
log.debug "Recalculated remaining time:
#{@remaining_times_per_cd_per_src}"
end
- SlideShow.next_recalc_time = ::Time.now.to_i + SlideShow.recalc_interval
+ # Since yast2 3.1.182, SlideShow.next_recalc_time holds the uptime value
+ # to avoid problems if timezone changes (bnc#956730), so
+ # Yast2::SystemTime.uptime must be used instead of ::Time.now
+ # (bsc#982138).
+ SlideShow.next_recalc_time = Yast2::SystemTime.uptime +
SlideShow.recalc_interval
true
end
@@ -713,7 +717,7 @@
def SwitchToSecondsIfNecessary
if @unit_is_seconds ||
Ops.less_than(
- ::Time.now.to_i,
+ Yast2::SystemTime.uptime,
Ops.add(SlideShow.start_time, SlideShow.initial_recalc_delay)
)
return false # no need to switch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.102/test/Makefile.am
new/yast2-packager-3.1.107/test/Makefile.am
--- old/yast2-packager-3.1.102/test/Makefile.am 2016-06-10 09:52:04.000000000
+0200
+++ new/yast2-packager-3.1.107/test/Makefile.am 2016-07-06 17:24:30.000000000
+0200
@@ -1,7 +1,9 @@
TESTS = \
addon_product_test.rb \
+ inst_url_test.rb \
product_patterns_test.rb \
package_installation_test.rb \
+ package_slide_show_test.rb \
packages_test.rb \
pkg_finish_test.rb \
source_dialogs_test.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.102/test/inst_url_test.rb
new/yast2-packager-3.1.107/test/inst_url_test.rb
--- old/yast2-packager-3.1.102/test/inst_url_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-packager-3.1.107/test/inst_url_test.rb 2016-07-06
17:24:30.000000000 +0200
@@ -0,0 +1,63 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "InstURL"
+Yast.import "Linuxrc"
+
+describe Yast::InstURL do
+ subject(:inst_url) { Yast::InstURL }
+
+ describe "#installInf2Url" do
+ let(:zypp_repo_url) { "http://opensuse.org/repo"; }
+ let(:ssl_verify) { "yes" }
+
+ before do
+ Yast::InstURL.main
+ allow(Yast::Linuxrc).to receive(:InstallInf).with("ZyppRepoURL")
+ .and_return(zypp_repo_url)
+ allow(Yast::Linuxrc).to receive(:InstallInf).with("ssl_verify")
+ .and_return(ssl_verify)
+ end
+
+ context "when ZyppRepURL is defined in install.inf" do
+ it "returns ZyppRepoURL" do
+ expect(inst_url.installInf2Url("")).to eq(zypp_repo_url)
+ end
+ end
+
+ context "when ZyppRepoURL is not defined" do
+ let(:zypp_repo_url) { nil }
+
+ it "returns cd:///" do
+ expect(inst_url.installInf2Url("")).to eq("cd:///")
+ end
+ end
+
+ context "when an extra_dir is given" do
+ it "adds the extra_dir to the path" do
+ expect(inst_url.installInf2Url("extra")).to
eq("#{zypp_repo_url}/extra")
+ end
+ end
+
+ context "when ssl verification is disabled" do
+ let(:ssl_verify) { "no" }
+
+ context "and a HTTPS URL is given" do
+ let(:zypp_repo_url) { "https://opensuse.org/repo"; }
+
+ it "adds ssl_verify=no to the URL" do
+ expect(inst_url.installInf2Url("")).to
eq("#{zypp_repo_url}?ssl_verify=no")
+ end
+ end
+
+ context "and a HTTPS URL with extra query parameters is given" do
+ let(:zypp_repo_url) { "https://opensuse.org/repo?key1=val1&key2=val2"; }
+
+ it "adds ssl_verify=no to the URL" do
+ expect(inst_url.installInf2Url("")).to
eq("#{zypp_repo_url}&ssl_verify=no")
+ end
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/test/package_slide_show_test.rb
new/yast2-packager-3.1.107/test/package_slide_show_test.rb
--- old/yast2-packager-3.1.102/test/package_slide_show_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-packager-3.1.107/test/package_slide_show_test.rb 2016-07-06
17:24:30.000000000 +0200
@@ -0,0 +1,15 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "PackageSlideShow"
+
+describe Yast::PackageSlideShow do
+ subject(:package_slide_show) { Yast::PackageSlideShow }
+
+ describe "#ListSum" do
+ it "returns the sum skipping '-1' values" do
+ expect(package_slide_show.ListSum([1, 2, 3, -1, 4])).to eq(10)
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-anon-ftp
new/yast2-packager-3.1.107/testsuite/data/install.inf-anon-ftp
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-anon-ftp
2016-06-10 09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-anon-ftp
1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-Sourcemounted: 0
-Display: Color
-HasPCMCIA: 0
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Serverdir: pub
-Domain: suse.de
-InitrdModules: cdrom sr_mod ide-cd aic7xxx
-Manual: 1
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 144444
-VNC: 0
-UseSSH: 0
-BootDisk: 0
-Disks: /dev/sda /dev/sdb
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-anon-ftp-toplevel
new/yast2-packager-3.1.107/testsuite/data/install.inf-anon-ftp-toplevel
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-anon-ftp-toplevel
2016-06-10 09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-anon-ftp-toplevel
1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Sourcemounted: 0
-Display: Color
-HasPCMCIA: 0
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Domain: suse.de
-InitrdModules: cdrom sr_mod ide-cd aic7xxx
-Manual: 1
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 144304
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/sda /dev/sdb
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-cdrom
new/yast2-packager-3.1.107/testsuite/data/install.inf-cdrom
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-cdrom 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-cdrom 1970-01-01
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-Sourcemounted: 1
-Display: Color
-Cdrom: hdc
-HasPCMCIA: 0
-InstMode: cd
-InitrdModules: cdrom sr_mod ide-cd
-Manual: 0
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 447076
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/hda
-Keyboard: 1
-Framebuffer: 0x031a
-X11i:
-XServer: radeon
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-cifs
new/yast2-packager-3.1.107/testsuite/data/install.inf-cifs
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-cifs 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-cifs 1970-01-01
01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Sourcemounted: 1
-Display: Color
-Alias: eth0 tulip
-HasPCMCIA: 0
-InstMode: cifs
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Serverdir: cd
-Domain: suse.de
-InitrdModules: cdrom sr_mod ide-cd
-Manual: 0
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 190940
-VNC: 0
-UseSSH: 0
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-ftp
new/yast2-packager-3.1.107/testsuite/data/install.inf-ftp
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-ftp 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-ftp 1970-01-01
01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-Language: german
-Locale: de_DE
-Sourcemounted: 0
-Display: Color
-Keytable: de-lat1-nd
-Alias: eth0 via-rhine
-HasPCMCIA: 1
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-IP: 192.168.0.38
-Hostname: 192.168.0.38
-Broadcast: 192.168.0.255
-Network: 192.168.0.0
-Netmask: 255.255.255.0
-Gateway: 192.168.0.1
-Nameserver: 212.185.248.50
-Server: 192.168.0.1
-Serverdir: /suse-cds/CD1
-Domain: hillier.de
-Username: gernot
-Password: no chance ;)
-InitrdModules: cdrom sr_mod ide-cd
-Manual: 1
-Demo: 0
-Floppydisk: /dev/fd0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 288716
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/hda
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: savage
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-http
new/yast2-packager-3.1.107/testsuite/data/install.inf-http
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-http 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-http 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-Sourcemounted: 0
-Display: Color
-HasPCMCIA: 0
-InstMode: http
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Domain: suse.de
-InitrdModules: cdrom sr_mod ide-cd
-Manual: 1
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 144932
-VNC: 0
-UseSSH: 0
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-nfs
new/yast2-packager-3.1.107/testsuite/data/install.inf-nfs
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-nfs 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-nfs 1970-01-01
01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-Sourcemounted: 1
-Display: Color
-Alias: eth0 tg3
-HasPCMCIA: 0
-InstMode: nfs
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.101.140
-Hostname: 10.10.101.140
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.0.4
-Serverdir: /machcd/CDs/suse82-pers-x86-64/CD1
-Domain: suse.de
-InitrdModules: sr_mod
-Manual: 0
-Demo: 0
-UpdateDir: /linux/suse/x86_64-8.2
-YaST2update: 0
-Textmode: 1
-MemFree: 426620
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/hda
-Keyboard: 1
-Framebuffer: 0x031a
-X11i:
-XServer: radeon
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-smb
new/yast2-packager-3.1.107/testsuite/data/install.inf-smb
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-smb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-smb 1970-01-01
01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Sourcemounted: 1
-Display: Color
-Alias: eth0 tulip
-HasPCMCIA: 0
-InstMode: smb
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Serverdir: cd
-Domain: suse.de
-InitrdModules: cdrom sr_mod ide-cd
-Manual: 0
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 190940
-VNC: 0
-UseSSH: 0
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-user-ftp-local
new/yast2-packager-3.1.107/testsuite/data/install.inf-user-ftp-local
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-user-ftp-local
2016-06-10 09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-user-ftp-local
1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-Sourcemounted: 0
-Display: Color
-HasPCMCIA: 0
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Serverdir: ftp
-Domain: suse.de
-Username: kkaempf
-Password: kkkkk
-InitrdModules: cdrom sr_mod ide-cd aic7xxx
-Manual: 1
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 144276
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/sda /dev/sdb
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/data/install.inf-user-ftp-rooted
new/yast2-packager-3.1.107/testsuite/data/install.inf-user-ftp-rooted
--- old/yast2-packager-3.1.102/testsuite/data/install.inf-user-ftp-rooted
2016-06-10 09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/data/install.inf-user-ftp-rooted
1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-Sourcemounted: 0
-Display: Color
-HasPCMCIA: 0
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-IP: 10.10.1.143
-Hostname: 10.10.1.143
-Broadcast: 10.10.255.255
-Network: 10.10.0.0
-Netmask: 255.255.0.0
-Gateway: 10.10.0.8
-Nameserver: 10.10.0.1
-Server: 10.10.101.140
-Serverdir: /ftp
-Domain: suse.de
-Username: kkaempf
-Password: kkkkk
-InitrdModules: cdrom sr_mod ide-cd aic7xxx
-Manual: 1
-Demo: 0
-UpdateDir: /linux/suse/i386-8.2
-YaST2update: 0
-Textmode: 0
-MemFree: 144100
-VNC: 0
-UseSSH: 0
-BootDisk: 1
-Disks: /dev/sda /dev/sdb
-Keyboard: 1
-Framebuffer: 0x0317
-X11i:
-XServer: nv
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-cd.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-cd.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-cd.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-cd.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode"]
-Read .etc.install_inf."InstMode" "cd"
-Log Initial repository not found in install.inf
-Read .probe.cdrom [$["dev_name":"/dev/hda"]]
-Return cd:///?devices=/dev/hda
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode"]
-Read .etc.install_inf."InstMode" nil
-Log Initial repository not found in install.inf
-Read .probe.cdrom [$["dev_name":"/dev/hda"]]
-Return cd:///?devices=/dev/hda
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.102/testsuite/tests/insturl-cd.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-cd.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-cd.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-cd.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlCdClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => { "install_inf" => { "InstMode" => "cd" } },
- "probe" => { "cdrom" => [{ "dev_name" => "/dev/hda" }] }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
- Yast.import "Linuxrc"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- Linuxrc.ResetInstallInf
- Ops.set(@READ, ["etc", "install_inf", "InstMode"], nil)
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlCdClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-ftp.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-ftp.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-ftp.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-ftp.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir"]
-Read .etc.install_inf."InstMode" "ftp"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Log Initial repository not found in install.inf
-Return ftp://192.168.1.1/pub
-Log Initial repository not found in install.inf
-Return ftp://192.168.1.1/pub/test
-Log Initial repository not found in install.inf
-Return ftp://192.168.1.1/pub/test
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir"]
-Read .etc.install_inf."InstMode" "ftp"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "/pub"
-Log Initial repository not found in install.inf
-Return ftp://192.168.1.1/%2fpub
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir",
"Username"]
-Read .etc.install_inf."InstMode" "ftp"
-Read .etc.install_inf."Password" "yast2"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Username" "suse"
-Log Initial repository not found in install.inf
-Return ftp://suse:yast2@192.168.1.1/pub
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-ftp.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-ftp.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-ftp.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-ftp.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlFtpClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => {
- "install_inf" => {
- "InstMode" => "ftp",
- "Server" => "192.168.1.1",
- "Serverdir" => "pub"
- }
- }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
- Yast.import "Linuxrc"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("test") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("/test") }, [@READ], nil)
-
-
- Ops.set(@READ, ["etc", "install_inf", "Serverdir"], "/pub")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
-
- Ops.set(@READ, ["etc", "install_inf", "Username"], "suse")
- Ops.set(@READ, ["etc", "install_inf", "Password"], "yast2")
- Ops.set(@READ, ["etc", "install_inf", "Serverdir"], "pub")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlFtpClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-http.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-http.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-http.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-http.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir"]
-Read .etc.install_inf."InstMode" "http"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "/install"
-Log Initial repository not found in install.inf
-Return http://192.168.1.1/install
-Log Initial repository not found in install.inf
-Return http://192.168.1.1/install/test
-Log Initial repository not found in install.inf
-Return http://192.168.1.1/install/test
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Password", "Port", "Server",
"Serverdir", "Username"]
-Read .etc.install_inf."InstMode" "http"
-Read .etc.install_inf."Password" "yast2"
-Read .etc.install_inf."Port" "8888"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Username" "suse"
-Log Initial repository not found in install.inf
-Return http://suse:yast2@192.168.1.1:8888/pub
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Password", "Port", "Proxy",
"ProxyPassword", "ProxyPort", "ProxyUser", "Server", "Serverdir", "Username"]
-Read .etc.install_inf."InstMode" "http"
-Read .etc.install_inf."Password" "yast2"
-Read .etc.install_inf."Port" "8888"
-Read .etc.install_inf."Proxy" "http://proxy.suse.de";
-Read .etc.install_inf."ProxyPassword" "bar"
-Read .etc.install_inf."ProxyPort" "8888"
-Read .etc.install_inf."ProxyUser" "foo"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Username" "suse"
-Log Initial repository not found in install.inf
-Return
http://suse:yast2@192.168.1.1:8888/pub?proxy=http://proxy.suse.de&proxyport=8888&proxyuser=foo&proxypassword=bar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-http.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-http.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-http.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-http.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlHttpClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => {
- "install_inf" => {
- "InstMode" => "http",
- "Server" => "192.168.1.1",
- "Serverdir" => "/install"
- }
- }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
- Yast.import "Linuxrc"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("test") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("/test") }, [@READ], nil)
-
-
-
- Ops.set(@READ, ["etc", "install_inf", "Username"], "suse")
- Ops.set(@READ, ["etc", "install_inf", "Password"], "yast2")
- Ops.set(@READ, ["etc", "install_inf", "Serverdir"], "pub")
- Ops.set(@READ, ["etc", "install_inf", "Port"], "8888")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- Ops.set(@READ, ["etc", "install_inf", "Proxy"], "http://proxy.suse.de";)
- Ops.set(@READ, ["etc", "install_inf", "ProxyPort"], "8888")
- Ops.set(@READ, ["etc", "install_inf", "ProxyUser"], "foo")
- Ops.set(@READ, ["etc", "install_inf", "ProxyPassword"], "bar")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlHttpClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-iso.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-iso.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-iso.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-iso.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "SourceType"]
-Read .etc.install_inf."InstMode" "nfs"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "/install/images/CD1.iso"
-Read .etc.install_inf."SourceType" "file"
-Log Initial repository not found in install.inf
-Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/
-Log Initial repository not found in install.inf
-Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test
-Log Initial repository not found in install.inf
-Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-iso.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-iso.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-iso.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-iso.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlIsoClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => {
- "install_inf" => {
- "InstMode" => "nfs",
- "Server" => "192.168.1.1",
- "Serverdir" => "/install/images/CD1.iso",
- "SourceType" => "file"
- }
- }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
- Yast.import "Linuxrc"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("test") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("/test") }, [@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlIsoClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-ops.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-ops.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-ops.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-ops.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode"]
-Read .etc.install_inf."InstMode" "cd"
-Log Initial repository not found in install.inf
-Read .probe.cdrom [$["dev_name":"/dev/hda"]]
-Return cd:///?devices=/dev/hda
-Read .probe.cdrom [$["dev_name":"/dev/hdb"], $["dev_name":"/dev/hdd"]]
-Read .probe.cdrom [$["dev_name":"/dev/hdb"], $["dev_name":"/dev/hdd"]]
-Return cd:///sp2?devices=/dev/hdb,/dev/hdd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-ops.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-ops.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-ops.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-ops.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlOpsClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => { "install_inf" => { "InstMode" => "cd" } },
- "probe" => { "cdrom" => [{ "dev_name" => "/dev/hda" }] }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- Ops.set(
- @READ,
- ["probe", "cdrom"],
- [{ "dev_name" => "/dev/hdb" }, { "dev_name" => "/dev/hdd" }]
- )
- TEST(lambda { InstURL.RewriteCDUrl("cd:///sp2?devices=/dev/hda") },
[@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlOpsClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-smb.out
new/yast2-packager-3.1.107/testsuite/tests/insturl-smb.out
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-smb.out 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-smb.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-Read .target.tmpdir "/tmp"
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "Share"]
-Read .etc.install_inf."InstMode" "smb"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Share" "SHARE"
-Log Initial repository not found in install.inf
-Return smb://192.168.1.1/SHARE/pub
-Log Initial repository not found in install.inf
-Return smb://192.168.1.1/SHARE/pub/test
-Log Initial repository not found in install.inf
-Return smb://192.168.1.1/SHARE/pub/test
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "Share"]
-Read .etc.install_inf."InstMode" "smb"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "/pub"
-Read .etc.install_inf."Share" "SHARE"
-Log Initial repository not found in install.inf
-Return smb://192.168.1.1/SHARE//pub
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir",
"Share", "Username"]
-Read .etc.install_inf."InstMode" "smb"
-Read .etc.install_inf."Password" "yast2"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Share" "SHARE"
-Read .etc.install_inf."Username" "suse"
-Log Initial repository not found in install.inf
-Return smb://suse:yast2@192.168.1.1/SHARE/pub
-Read .target.size "/etc/install.inf" 1
-Dir .etc.install_inf: ["InstMode", "Password", "Server", "Serverdir",
"Share", "Username", "WorkDomain"]
-Read .etc.install_inf."InstMode" "smb"
-Read .etc.install_inf."Password" "yast2"
-Read .etc.install_inf."Server" "192.168.1.1"
-Read .etc.install_inf."Serverdir" "pub"
-Read .etc.install_inf."Share" "SHARE"
-Read .etc.install_inf."Username" "suse"
-Read .etc.install_inf."WorkDomain" "group"
-Log Initial repository not found in install.inf
-Return smb://suse:yast2@192.168.1.1/SHARE/pub?workgroup=group
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.102/testsuite/tests/insturl-smb.rb
new/yast2-packager-3.1.107/testsuite/tests/insturl-smb.rb
--- old/yast2-packager-3.1.102/testsuite/tests/insturl-smb.rb 2016-06-10
09:52:04.000000000 +0200
+++ new/yast2-packager-3.1.107/testsuite/tests/insturl-smb.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-# encoding: utf-8
-
-module Yast
- class InsturlSmbClient < Client
- def main
- Yast.include self, "testsuite.rb"
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp" },
- "etc" => {
- "install_inf" => {
- "InstMode" => "smb",
- "Server" => "192.168.1.1",
- "Serverdir" => "pub",
- "Share" => "SHARE"
- }
- }
- }
-
- TESTSUITE_INIT([@READ], nil)
- Yast.import "InstURL"
- Yast.import "Linuxrc"
-
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("test") }, [@READ], nil)
- TEST(lambda { InstURL.installInf2Url("/test") }, [@READ], nil)
-
-
- Ops.set(@READ, ["etc", "install_inf", "Serverdir"], "/pub")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- Ops.set(@READ, ["etc", "install_inf", "Username"], "suse")
- Ops.set(@READ, ["etc", "install_inf", "Password"], "yast2")
- Ops.set(@READ, ["etc", "install_inf", "Serverdir"], "pub")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- Ops.set(@READ, ["etc", "install_inf", "WorkDomain"], "group")
- Linuxrc.ResetInstallInf
- TEST(lambda { InstURL.installInf2Url("") }, [@READ], nil)
-
- nil
- end
- end
-end
-
-Yast::InsturlSmbClient.new.main
