Hello community,
here is the log from the commit of package yast2-http-server for
openSUSE:Factory checked in at 2020-03-07 21:36:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-http-server.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server"
Sat Mar 7 21:36:55 2020 rev:94 rq:781533 version:4.2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes
2020-03-01 21:26:52.984418635 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-http-server.new.26092/yast2-http-server.changes
2020-03-07 21:36:59.308221505 +0100
@@ -1,0 +2,7 @@
+Wed Mar 4 08:24:20 UTC 2020 - Knut Anderssen <kanders...@suse.com>
+
+- Propose to restart the http service as the default action when it
+ is running (bsc#1165638)
+- 4.2.7
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-4.2.6.tar.bz2
New:
----
yast2-http-server-4.2.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.ASpalz/_old 2020-03-07 21:36:59.668221748 +0100
+++ /var/tmp/diff_new_pack.ASpalz/_new 2020-03-07 21:36:59.672221750 +0100
@@ -17,7 +17,7 @@
Name: yast2-http-server
-Version: 4.2.6
+Version: 4.2.7
Release: 0
Summary: YaST2 - HTTP Server Configuration
License: GPL-2.0-only
@@ -38,7 +38,6 @@
BuildRequires: yast2-network
BuildRequires: yast2-packagemanager-devel
BuildRequires: yast2-perl-bindings
-BuildRequires: yast2-testsuite
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
# Yast2::ServiceWidget
++++++ yast2-http-server-4.2.6.tar.bz2 -> yast2-http-server-4.2.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/package/yast2-http-server.changes
new/yast2-http-server-4.2.7/package/yast2-http-server.changes
--- old/yast2-http-server-4.2.6/package/yast2-http-server.changes
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/package/yast2-http-server.changes
2020-03-04 14:35:24.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Mar 4 08:24:20 UTC 2020 - Knut Anderssen <kanders...@suse.com>
+
+- Propose to restart the http service as the default action when it
+ is running (bsc#1165638)
+- 4.2.7
+
+-------------------------------------------------------------------
Mon Feb 17 17:37:21 UTC 2020 - Stefan Hundhammer <shundham...@suse.com>
- Fixed user-visible messages (bsc#1084015)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/package/yast2-http-server.spec
new/yast2-http-server-4.2.7/package/yast2-http-server.spec
--- old/yast2-http-server-4.2.6/package/yast2-http-server.spec 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/package/yast2-http-server.spec 2020-03-04
14:35:24.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-http-server
-Version: 4.2.6
+Version: 4.2.7
Release: 0
Summary: YaST2 - HTTP Server Configuration
Group: System/YaST
@@ -36,7 +36,7 @@
BuildRequires: update-desktop-files
BuildRequires: yast2-packagemanager-devel
BuildRequires: yast2-perl-bindings
-BuildRequires: yast2-testsuite libzio
+BuildRequires: libzio
BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/src/modules/HttpServerWidgets.rb
new/yast2-http-server-4.2.7/src/modules/HttpServerWidgets.rb
--- old/yast2-http-server-4.2.6/src/modules/HttpServerWidgets.rb
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/src/modules/HttpServerWidgets.rb
2020-03-04 14:35:24.000000000 +0100
@@ -765,7 +765,9 @@
#
# @return [::CWM::ServiceWidget]
def service_widget
- @service_widget ||= ::CWM::ServiceWidget.new(HttpServer.service)
+ @service_widget = ::CWM::ServiceWidget.new(HttpServer.service)
+ @service_widget.default_action = :restart if HttpServer.service&.running?
+ @service_widget
end
# Validate certificate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-http-server-4.2.6/test/routines_test.rb
new/yast2-http-server-4.2.7/test/routines_test.rb
--- old/yast2-http-server-4.2.6/test/routines_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-http-server-4.2.7/test/routines_test.rb 2020-03-04
14:35:24.000000000 +0100
@@ -0,0 +1,35 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+require "yast"
+
+Yast.import "HttpServer"
+
+describe Yast::HttpServerRoutinesInclude do
+ # it is included in http server module
+ subject { Yast::HttpServer }
+
+ describe "#listen2item" do
+ it "returns Item with \"all addresses\" and port number for port number
only" do
+ expect(subject.listen2item("128", :first)).to eq Item(Id(:first), "All
Addresses", "128")
+ end
+
+ it "returns Item with address and port number for adrress with port
number" do
+ expect(subject.listen2item("127.0.0.1:128", :first)).to eq
Item(Id(:first), "127.0.0.1", "128")
+ end
+
+ it "return Item with id specified in second argument" do
+ expect(subject.listen2item("127.0.0.1:128", :first)).to eq
Item(Id(:first), "127.0.0.1", "128")
+ end
+ end
+
+ describe "#listen2map" do
+ it "returns hash with \"address\" \"all\" and port number for port number
only" do
+ expect(subject.listen2map("128")).to eq("port" => "128", "address" =>
"all")
+ end
+
+ it "returns hash with address and port number for address with port
number" do
+ expect(subject.listen2map("127.0.0.1:128")).to eq("port" => "128",
"address" => "127.0.0.1")
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-http-server-4.2.6/testsuite/Makefile.am
new/yast2-http-server-4.2.7/testsuite/Makefile.am
--- old/yast2-http-server-4.2.6/testsuite/Makefile.am 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/Makefile.am 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#
-# Makefile.am for .../testsuite
-#
-# Do not edit this file (Makefile.am) as it will be overwritten!
-#
-
-AUTOMAKE_OPTIONS = dejagnu
-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard
tests/*.rb)
-
-testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
-
-all-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
-
-clean-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
-
-check-local: $(testsuite_prepare)
- make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
-
-# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/getCurrentListen.out
new/yast2-http-server-4.2.7/testsuite/tests/getCurrentListen.out
--- old/yast2-http-server-4.2.6/testsuite/tests/getCurrentListen.out
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/getCurrentListen.out
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Read .http_server.listen ["80", "127.0.0.1:99"]
-Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/getCurrentListen.rb
new/yast2-http-server-4.2.7/testsuite/tests/getCurrentListen.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/getCurrentListen.rb
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/getCurrentListen.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-# testedfile: YaST::HTTPDData.pm
-# return map of ip addresses and ports where apache2 listens
-module Yast
- class GetCurrentListenClient < Client
- def main
- Yast.include self, "testsuite.rb"
-
- @READ = { "http_server" => { "listen" => ["80", "127.0.0.1:99"] } }
- TESTSUITE_INIT([@READ, {}, {}], nil)
-
- Yast.import "YaPI::HTTPD"
- Yast.import "YaST::HTTPDData"
-
-
- TEST(lambda { YaST::HTTPDData.ReadListen }, [@READ, {}, {}], nil)
-
- nil
- end
- end
-end
-
-Yast::GetCurrentListenClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/listen2item.out
new/yast2-http-server-4.2.7/testsuite/tests/listen2item.out
--- old/yast2-http-server-4.2.6/testsuite/tests/listen2item.out 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/listen2item.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Read .target.tmpdir nil
-Log Failed to set temporary directory: nil
-Return `item (`id (0), "192.168.1.2", "80")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/listen2item.rb
new/yast2-http-server-4.2.7/testsuite/tests/listen2item.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/listen2item.rb 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/listen2item.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-#testedfile: routines.ycp
-#return list [ item, address, port ]
-module Yast
- class Listen2itemClient < Client
- def main
- Yast.import "UI"
- Yast.include self, "testsuite.rb"
-
-
- Yast.include self, "http-server/routines.rb"
-
- TEST(lambda { listen2item("192.168.1.2:80", 0) }, [{}, {}, {}], nil)
-
- nil
- end
-
- def Modified
- true
- end
-
- def AbortFunction
- true
- end
- end
-end
-
-Yast::Listen2itemClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/listen2map.out
new/yast2-http-server-4.2.7/testsuite/tests/listen2map.out
--- old/yast2-http-server-4.2.6/testsuite/tests/listen2map.out 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/listen2map.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Read .target.tmpdir nil
-Log Failed to set temporary directory: nil
-Return $["address":"192.168.1.2", "port":"80"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/listen2map.rb
new/yast2-http-server-4.2.7/testsuite/tests/listen2map.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/listen2map.rb 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/listen2map.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-#testfile: routines.ycp
-#return list of maps [ address:"address", port:"port" ]
-module Yast
- class Listen2mapClient < Client
- def main
- Yast.import "UI"
- Yast.include self, "testsuite.rb"
-
-
- Yast.include self, "http-server/routines.rb"
-
- TEST(lambda { listen2map("192.168.1.2:80") }, [{}, {}, {}], nil)
-
- nil
- end
-
- def Modified
- true
- end
-
- def AbortFunction
- true
- end
- end
-end
-
-Yast::Listen2mapClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/parseDirOption.out
new/yast2-http-server-4.2.7/testsuite/tests/parseDirOption.out
--- old/yast2-http-server-4.2.6/testsuite/tests/parseDirOption.out
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/parseDirOption.out
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Return $["KEY":"_SECTION", "SECTIONNAME":"Directory",
"SECTIONPARAM":"/usr/share/YaST2/modules/", "VALUE":[$["KEY":"YaST2/modules",
"VALUE":nil]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/parseDirOption.rb
new/yast2-http-server-4.2.7/testsuite/tests/parseDirOption.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/parseDirOption.rb
2020-02-18 11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/parseDirOption.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-# encoding: utf-8
-
-#testedfile: YaST::HTTPDData.pm
-#return list of maps directory parameters
-module Yast
- class ParseDirOptionClient < Client
- def main
- Yast.include self, "testsuite.rb"
-
- Yast.import "YaPI::HTTPD"
- Yast.import "YaST::HTTPDData"
-
- TEST(lambda do
- YaST::HTTPDData.ParseDirOption(
- "/usr/share/YaST2/modules/\nYaST2/modules\n"
- )
- end, [
- {},
- {},
- {}
- ], nil)
-
- nil
- end
- end
-end
-
-Yast::ParseDirOptionClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/readHosts.out
new/yast2-http-server-4.2.7/testsuite/tests/readHosts.out
--- old/yast2-http-server-4.2.6/testsuite/tests/readHosts.out 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/readHosts.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Read .http_server.vhosts
$["default-server.conf":[$["DATA":[$["KEY":"DocumentRoot", "OVERHEAD":"",
"VALUE":"\"/srv/www/htdocs\""], $["KEY":"_SECTION", "OVERHEAD":"",
"SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/htdocs\"",
"VALUE":[$["KEY":"Options", "OVERHEAD":"", "VALUE":"None"],
$["KEY":"AllowOverride", "OVERHEAD":"", "VALUE":"None"], $["KEY":"Require",
"VALUE":"all granted"]]], $["KEY":"Alias", "OVERHEAD":"", "VALUE":"/icons/
\"/usr/share/apache2/icons/\""], $["KEY":"_SECTION", "OVERHEAD":"",
"SECTIONNAME":"Directory", "SECTIONPARAM":"\"/usr/share/apache2/icons\"",
"VALUE":[$["KEY":"Options", "VALUE":"Indexes MultiViews"],
$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require", "VALUE":"all
granted"]]], $["KEY":"ScriptAlias", "OVERHEAD":"", "VALUE":"/cgi-bin/
\"/srv/www/cgi-bin/\""], $["KEY":"_SECTION", "OVERHEAD":"",
"SECTIONNAME":"Directory", "SECTIONPARAM":"\"/srv/www/cgi-bin\"",
"VALUE":[$["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Options",
"VALUE":"+ExecCGI -Includes"], $["KEY":"Require", "VALUE":"all granted"]]],
$["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"IfModule",
"SECTIONPARAM":"mod_userdir.c", "VALUE":[$["KEY":"UserDir", "OVERHEAD":"",
"VALUE":"public_html"], $["KEY":"Include", "OVERHEAD":"",
"VALUE":"/etc/apache2/mod_userdir.conf"]]], $["KEY":"Include", "OVERHEAD":"",
"VALUE":"/etc/apache2/conf.d/*.conf"], $["KEY":"Include", "OVERHEAD":"",
"VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName",
"VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"],
$["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory",
"SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options",
"VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require",
"VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"],
$["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]], "HOSTID":"default",
"VirtualByName":"0"]], "yast2_vhosts.conf":[$["DATA":[$["KEY":"DocumentRoot",
"VALUE":"/srv/viewcvs/"], $["KEY":"ServerName", "VALUE":"TestNew"],
$["KEY":"ServerAdmin", "VALUE":"j...@ja.sk"], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]],
"HOSTID":"10.20.1.28/TestNew", "HostIP":"10.20.1.28", "VirtualByName":"1"],
$["OVERHEAD":""]]]
-Return true
-Return ["default", "10.20.1.28/TestNew"]
-Return [$["KEY":"DocumentRoot", "VALUE":"/srv/viewcvs/"],
$["KEY":"ServerName", "VALUE":"TestNew"], $["KEY":"ServerAdmin",
"VALUE":"j...@ja.sk"], $["KEY":"_SECTION", "OVERHEAD":"",
"SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLEngine", "VALUE":"on"]]], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLRequireSSL", "VALUE":""]]]]
-Return [$["KEY":"DocumentRoot", "OVERHEAD":"", "VALUE":"\"/srv/www/htdocs\""],
$["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory",
"SECTIONPARAM":"\"/srv/www/htdocs\"", "VALUE":[$["KEY":"Options",
"OVERHEAD":"", "VALUE":"None"], $["KEY":"AllowOverride", "OVERHEAD":"",
"VALUE":"None"], $["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"Alias",
"OVERHEAD":"", "VALUE":"/icons/ \"/usr/share/apache2/icons/\""],
$["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory",
"SECTIONPARAM":"\"/usr/share/apache2/icons\"", "VALUE":[$["KEY":"Options",
"VALUE":"Indexes MultiViews"], $["KEY":"AllowOverride", "VALUE":"None"],
$["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"ScriptAlias",
"OVERHEAD":"", "VALUE":"/cgi-bin/ \"/srv/www/cgi-bin/\""], $["KEY":"_SECTION",
"OVERHEAD":"", "SECTIONNAME":"Directory",
"SECTIONPARAM":"\"/srv/www/cgi-bin\"", "VALUE":[$["KEY":"AllowOverride",
"VALUE":"None"], $["KEY":"Options", "VALUE":"+ExecCGI -Includes"],
$["KEY":"Require", "VALUE":"all granted"]]], $["KEY":"_SECTION", "OVERHEAD":"",
"SECTIONNAME":"IfModule", "SECTIONPARAM":"mod_userdir.c",
"VALUE":[$["KEY":"UserDir", "OVERHEAD":"", "VALUE":"public_html"],
$["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/mod_userdir.conf"]]],
$["KEY":"Include", "OVERHEAD":"", "VALUE":"/etc/apache2/conf.d/*.conf"],
$["KEY":"Include", "OVERHEAD":"",
"VALUE":"/etc/apache2/conf.d/apache2-manual?conf"], $["KEY":"ServerName",
"VALUE":"test"], $["KEY":"ServerAdmin", "VALUE":"test@test"],
$["KEY":"_SECTION", "OVERHEAD":"", "SECTIONNAME":"Directory",
"SECTIONPARAM":"\"/srv/viewcvs/\"", "VALUE":[$["KEY":"Options",
"VALUE":"None"], $["KEY":"AllowOverride", "VALUE":"None"], $["KEY":"Require",
"VALUE":"all granted"]]], $["KEY":"NameVirtualHost", "VALUE":"10.20.1.28"],
$["KEY":"_SECTION", "SECTIONNAME":"IfDefine", "SECTIONPARAM":"SSL",
"VALUE":[$["KEY":"SSLEngine", "VALUE":"off"]]]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-http-server-4.2.6/testsuite/tests/readHosts.rb
new/yast2-http-server-4.2.7/testsuite/tests/readHosts.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/readHosts.rb 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/readHosts.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,211 +0,0 @@
-# encoding: utf-8
-
-#testfiles: YaST::HTTPDData.pm
-#return all hosts parameters
-#return list of hosts
-#return parameters of given host
-module Yast
- class ReadHostsClient < Client
- def main
- Yast.include self, "testsuite.rb"
-
- @READ = {
- "http_server" => {
- "vhosts" => {
- "default-server.conf" => [
- {
- "DATA" => [
- {
- "KEY" => "DocumentRoot",
- "OVERHEAD" => "",
- "VALUE" => "\"/srv/www/htdocs\""
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "Directory",
- "SECTIONPARAM" => "\"/srv/www/htdocs\"",
- "VALUE" => [
- {
- "KEY" => "Options",
- "OVERHEAD" => "",
- "VALUE" => "None"
- },
- {
- "KEY" => "AllowOverride",
- "OVERHEAD" => "",
- "VALUE" => "None"
- },
- { "KEY" => "Require", "VALUE" => "all granted" }
- ]
- },
- {
- "KEY" => "Alias",
- "OVERHEAD" => "",
- "VALUE" => "/icons/ \"/usr/share/apache2/icons/\""
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "Directory",
- "SECTIONPARAM" => "\"/usr/share/apache2/icons\"",
- "VALUE" => [
- { "KEY" => "Options", "VALUE" => "Indexes MultiViews" },
- { "KEY" => "AllowOverride", "VALUE" => "None" },
- { "KEY" => "Require", "VALUE" => "all granted" }
- ]
- },
- {
- "KEY" => "ScriptAlias",
- "OVERHEAD" => "",
- "VALUE" => "/cgi-bin/ \"/srv/www/cgi-bin/\""
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "Directory",
- "SECTIONPARAM" => "\"/srv/www/cgi-bin\"",
- "VALUE" => [
- { "KEY" => "AllowOverride", "VALUE" => "None" },
- { "KEY" => "Options", "VALUE" => "+ExecCGI -Includes" },
- { "KEY" => "Require", "VALUE" => "all granted" }
- ]
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfModule",
- "SECTIONPARAM" => "mod_userdir.c",
- "VALUE" => [
- {
- "KEY" => "UserDir",
- "OVERHEAD" => "",
- "VALUE" => "public_html"
- },
- {
- "KEY" => "Include",
- "OVERHEAD" => "",
- "VALUE" => "/etc/apache2/mod_userdir.conf"
- }
- ]
- },
- {
- "KEY" => "Include",
- "OVERHEAD" => "",
- "VALUE" => "/etc/apache2/conf.d/*.conf"
- },
- {
- "KEY" => "Include",
- "OVERHEAD" => "",
- "VALUE" => "/etc/apache2/conf.d/apache2-manual?conf"
- },
- { "KEY" => "ServerName", "VALUE" => "test" },
- { "KEY" => "ServerAdmin", "VALUE" => "test@test" },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "Directory",
- "SECTIONPARAM" => "\"/srv/viewcvs/\"",
- "VALUE" => [
- { "KEY" => "Options", "VALUE" => "None" },
- { "KEY" => "AllowOverride", "VALUE" => "None" },
- { "KEY" => "Require", "VALUE" => "all granted" }
- ]
- },
- { "KEY" => "NameVirtualHost", "VALUE" => "10.20.1.28" },
- {
- "KEY" => "_SECTION",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLEngine", "VALUE" => "off" }
- ]
- }
- ],
- "HOSTID" => "default",
- "VirtualByName" => "0"
- }
- ],
- "yast2_vhosts.conf" => [
- {
- "DATA" => [
- { "KEY" => "DocumentRoot", "VALUE" => "/srv/viewcvs/" },
- { "KEY" => "ServerName", "VALUE" => "TestNew" },
- { "KEY" => "ServerAdmin", "VALUE" => "j...@ja.sk" },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLRequireSSL", "VALUE" => "" }
- ]
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLRequireSSL", "VALUE" => "" }
- ]
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLRequireSSL", "VALUE" => "" }
- ]
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLEngine", "VALUE" => "on" }
- ]
- },
- {
- "KEY" => "_SECTION",
- "OVERHEAD" => "",
- "SECTIONNAME" => "IfDefine",
- "SECTIONPARAM" => "SSL",
- "VALUE" => [
- { "KEY" => "SSLRequireSSL", "VALUE" => "" }
- ]
- }
- ],
- "HOSTID" => "10.20.1.28/TestNew",
- "HostIP" => "10.20.1.28",
- "VirtualByName" => "1"
- },
- { "OVERHEAD" => "" }
- ]
- }
- }
- }
-
- TESTSUITE_INIT([@READ, {}, {}], nil)
-
- Yast.import "YaPI::HTTPD"
- Yast.import "YaST::HTTPDData"
-
-
- TEST(lambda { YaST::HTTPDData.ReadHosts }, [@READ, {}, {}], nil)
- TEST(lambda { YaST::HTTPDData.GetHostsList }, [@READ, {}, {}], nil)
- TEST(lambda { YaST::HTTPDData.GetHost("10.20.1.28/TestNew") }, [
- @READ,
- {},
- {}
- ], nil)
- TEST(lambda { YaST::HTTPDData.GetHost("default") }, [@READ, {}, {}], nil)
-
- nil
- end
- end
-end
-
-Yast::ReadHostsClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/readListen.out
new/yast2-http-server-4.2.7/testsuite/tests/readListen.out
--- old/yast2-http-server-4.2.6/testsuite/tests/readListen.out 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/readListen.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Read .http_server.listen ["80", "127.0.0.1:99"]
-Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-http-server-4.2.6/testsuite/tests/readListen.rb
new/yast2-http-server-4.2.7/testsuite/tests/readListen.rb
--- old/yast2-http-server-4.2.6/testsuite/tests/readListen.rb 2020-02-18
11:03:35.000000000 +0100
+++ new/yast2-http-server-4.2.7/testsuite/tests/readListen.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-#testfile: YaST::HTTPDData.pm
-#return list of current listens
-module Yast
- class ReadListenClient < Client
- def main
- Yast.include self, "testsuite.rb"
-
- @READ = { "http_server" => { "listen" => ["80", "127.0.0.1:99"] } }
- TESTSUITE_INIT([@READ, {}, {}], nil)
-
- Yast.import "YaPI::HTTPD"
- Yast.import "YaST::HTTPDData"
-
- TEST(lambda { YaST::HTTPDData.ReadListen }, [@READ, {}, {}], nil)
-
- nil
- end
- end
-end
-
-Yast::ReadListenClient.new.main
