Hello community,
here is the log from the commit of package yast2-nis-server for
openSUSE:Factory checked in at 2020-05-15 23:50:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nis-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-nis-server.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nis-server"
Fri May 15 23:50:04 2020 rev:44 rq:803022 version:4.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-nis-server/yast2-nis-server.changes
2020-03-01 21:27:27.132488002 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-nis-server.new.2738/yast2-nis-server.changes
2020-05-15 23:50:06.317288466 +0200
@@ -1,0 +2,7 @@
+Tue May 12 14:16:54 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+ (bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-server-4.2.2.tar.bz2
New:
----
yast2-nis-server-4.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-server.spec ++++++
--- /var/tmp/diff_new_pack.y94hxt/_old 2020-05-15 23:50:09.453294509 +0200
+++ /var/tmp/diff_new_pack.y94hxt/_new 2020-05-15 23:50:09.457294517 +0200
@@ -17,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.2.2
+Version: 4.3.0
Release: 0
Summary: YaST2 - Network Information Services (NIS) Server Configuration
License: GPL-2.0-only
@@ -26,15 +26,14 @@
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: doxygen
-BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2-network
BuildRequires: yast2-nis-client
-BuildRequires: yast2-testsuite
# SuSEFirewall2 replaced by firewalld (fate#323460)
BuildRequires: yast2 >= 4.0.39
BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
+BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
Requires: yast2-network
Requires: yast2-nis-client
@@ -58,8 +57,10 @@
%prep
%setup -q
+%check
+%yast_check
+
%build
-%yast_build
%install
%yast_install
++++++ yast2-nis-server-4.2.2.tar.bz2 -> yast2-nis-server-4.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/CONTRIBUTING.md
new/yast2-nis-server-4.3.0/CONTRIBUTING.md
--- old/yast2-nis-server-4.2.2/CONTRIBUTING.md 2020-02-28 13:20:56.000000000
+0100
+++ new/yast2-nis-server-4.3.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000
+0100
@@ -1,89 +0,0 @@
-YaST Contribution Guidelines
-============================
-
-YaST is an open source project and as such it welcomes all kinds of
-contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and the YaST
maintainers.
-
-There are two main forms of contribution: reporting bugs and performing code
-changes.
-
-Bug Reports
------------
-
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
-or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
-registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
-if you don't have an account yet.)
-
-When creating a bug report, please follow our [bug reporting
-guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
-
-We can't guarantee that every bug will be fixed, but we'll try.
-
-Code Changes
-------------
-
-We welcome all kinds of code contributions, from simple bug fixes to
significant
-refactorings and implementation of new features. However, before making any
-non-trivial contribution, get in touch with us first — this can prevent wasted
-effort on both sides. Also, have a look at our [development
-documentation](http://en.opensuse.org/openSUSE:YaST_development).
-
-To send us your code change, use GitHub pull requests. The workflow is as
-follows:
-
- 1. Fork the project.
-
- 2. Create a topic branch based on `master`.
-
- 3. Implement your change, including tests (if possible). Make sure you adhere
- to the [Ruby style
- guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
-
- 4. Update the package version (in `packages/*.spec`, usually by
- `rake version:bump`) and add a new entry to the `package/*.changes` file
- (by `osc vc package`).
- For bigger changes or changes which need longer discussion it is advised
to
- add this as a separate last commit so it can be easily updated when
another
- change is merged in the meantime.
-
- 5. Make sure your change didn't break anything by building the RPM package
- (`rake osc:build`). The build process includes running the full testsuite.
-
- 6. Publish the branch and create a pull request.
-
- 7. YaST developers will review your change and possibly point out issues.
- Adapt the code under their guidance until they are all resolved.
-
- 8. Finally, the pull request will get merged or rejected.
-
-See also [GitHub's guide on
-contributing](https://help.github.com/articles/fork-a-repo).
-
-If you want to do multiple unrelated changes, use separate branches and pull
-requests.
-
-### Commits
-
-Each commit in the pull request should do only one thing, which is clearly
-described by its commit message. Especially avoid mixing formatting changes and
-functional changes into one commit. When writing commit messages, adhere to
-[widely used
-conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-
-If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
-you mention it in the commit message for cross-reference. Use format like
-bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
-autolinking](https://help.github.com/articles/github-flavored-markdown#references)
-and [openSUSE abbreviation
-reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
-
-Additional Information
-----------------------
-
-If you have any question, feel free to ask at the [development mailing
-list](http://lists.opensuse.org/yast-devel/) or at the
-[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
-We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/Makefile.cvs
new/yast2-nis-server-4.3.0/Makefile.cvs
--- old/yast2-nis-server-4.2.2/Makefile.cvs 2020-02-28 13:20:56.000000000
+0100
+++ new/yast2-nis-server-4.3.0/Makefile.cvs 1970-01-01 01:00:00.000000000
+0100
@@ -1,23 +0,0 @@
-#
-# Makefile.cvs
-#
-
-LIB = $(shell y2tool get-lib)
-
-PREFIX = /usr
-
-configure: all
- ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB)
-
-all:
- y2tool y2autoconf
- y2tool y2automake
- autoreconf --force --install
-
-install: configure
- make
- make install
-
-reconf: all
- ./config.status --recheck
- ./config.status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/configure.in.in
new/yast2-nis-server-4.3.0/configure.in.in
--- old/yast2-nis-server-4.2.2/configure.in.in 2020-02-28 13:20:56.000000000
+0100
+++ new/yast2-nis-server-4.3.0/configure.in.in 1970-01-01 01:00:00.000000000
+0100
@@ -1,13 +0,0 @@
-## YCP module configure.in.in
-
-## Initialize
-@YAST2-INIT-COMMON@
-@YAST2-INIT-YCP@
-
-## some common checks
-@YAST2-CHECKS-COMMON@
-@YAST2-CHECKS-YCP@
-@YAST2-CHECKS-TESTSUITE@
-
-## and generate the output...
-@YAST2-OUTPUT@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/doc/images/Makefile.am
new/yast2-nis-server-4.3.0/doc/images/Makefile.am
--- old/yast2-nis-server-4.2.2/doc/images/Makefile.am 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/doc/images/Makefile.am 1970-01-01
01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-#
-# Makefile.am for nis-server/doc/images
-#
-
-htmldir = $(docdir)/images
-
-screenshots = \
- 0-load.png \
- 1-which.png \
- 2-master.png \
- 2-slave.png \
- 21-details.png \
- 3-slaves.png \
- 31-edit.png \
- 4-maps.png \
- 5-nets.png \
- 51-edit.png \
- 6-saving.png \
- abort.png \
- error-details.png \
- error.png \
- exit.png \
- finish.png \
- reboot.png \
- success.png
-
-workflow.jpg: workflow.dia $(screenshots)
- dia -n --export=workflow.png $<
- convert -quality 50 workflow.png $@
- -$(RM) workflow.png
-MAINTAINERCLEANFILES = workflow.jpg
-
-html_DATA = workflow.dia workflow.jpg $(screenshots)
-EXTRA_DIST = $(html_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.2.2/package/yast2-nis-server.changes
new/yast2-nis-server-4.3.0/package/yast2-nis-server.changes
--- old/yast2-nis-server-4.2.2/package/yast2-nis-server.changes 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/package/yast2-nis-server.changes 2020-05-12
16:31:20.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue May 12 14:16:54 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+ (bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------
Fri Feb 28 11:12:19 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
- Properly report in CLI whether NIS is configured or not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/package/yast2-nis-server.spec
new/yast2-nis-server-4.3.0/package/yast2-nis-server.spec
--- old/yast2-nis-server-4.2.2/package/yast2-nis-server.spec 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/package/yast2-nis-server.spec 2020-05-12
16:31:20.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.2.2
+Version: 4.3.0
Release: 0
Group: System/YaST
License: GPL-2.0-only
@@ -26,10 +26,12 @@
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2-network
yast2-nis-client yast2-testsuite
+BuildRequires: update-desktop-files yast2-network yast2-nis-client
# SuSEFirewall2 replaced by firewalld (fate#323460)
BuildRequires: yast2 >= 4.0.39
BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
+BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
Requires: yast2-network yast2-nis-client
# SuSEFirewall2 replaced by firewalld (fate#323460)
@@ -52,8 +54,10 @@
%prep
%setup -q
+%check
+%yast_check
+
%build
-%yast_build
%install
%yast_install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/src/Makefile.am
new/yast2-nis-server-4.3.0/src/Makefile.am
--- old/yast2-nis-server-4.2.2/src/Makefile.am 2020-02-28 13:20:56.000000000
+0100
+++ new/yast2-nis-server-4.3.0/src/Makefile.am 1970-01-01 01:00:00.000000000
+0100
@@ -1,42 +0,0 @@
-# Sources for nis-server
-
-module_DATA = \
- modules/NisServer.rb
-
-client_DATA = \
- clients/nis_server_auto.rb \
- clients/nis_server.rb \
- clients/nis-server.rb
-
-yncludedir = @yncludedir@/nis_server
-ynclude_DATA = \
- include/nis_server/what.rb \
- include/nis_server/wizards.rb \
- include/nis_server/slaves.rb \
- include/nis_server/securenets.rb \
- include/nis_server/ui.rb \
- include/nis_server/maps.rb \
- include/nis_server/master.rb \
- include/nis_server/routines.rb \
- include/nis_server/slave.rb \
- include/nis_server/details.rb
-
-scrconf_DATA = \
- scrconf/var_yp_securenets.scr \
- scrconf/var_yp_ypservers.scr \
- scrconf/run_ypwhich_m.scr
-
-schemafilesdir = $(schemadir)/autoyast/rnc
-schemafiles_DATA = \
- autoyast-rnc/nis_server.rnc
-
-desktop_DATA = \
- desktop/org.opensuse.yast.NISServer.desktop
-
-scalabledir = @icondir@/hicolor/scalable/apps
-scalable_DATA =\
- icons/hicolor/scalable/apps/yast-nis-server.svg
-
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA)
$(schemafiles_DATA) $(desktop_DATA) $(scalable_DATA)
-
-include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.2.2/src/autoyast-rnc/nis_server.rnc
new/yast2-nis-server-4.3.0/src/autoyast-rnc/nis_server.rnc
--- old/yast2-nis-server-4.2.2/src/autoyast-rnc/nis_server.rnc 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/src/autoyast-rnc/nis_server.rnc 2020-05-12
16:31:20.000000000 +0200
@@ -1,3 +1,6 @@
+
+include "common.rnc"
+
# NIS Server
y2_nisserver =
domain
@@ -16,47 +19,47 @@
| start_ypxfrd
| mingid
| minuid
-comment = element comment { text }
-flag = element flag { text }
-forename = element forename { text }
+comment = element comment { STRING }
+flag = element flag { STRING }
+forename = element forename { STRING }
mingid =
element mingid { INTEGER }
-grouplist = element grouplist { text }
-hash = element hash { text }
-nis_server_home = element home { text }
-inact = element inact { text }
-last_change = element last_change { text }
+grouplist = element grouplist { STRING }
+hash = element hash { STRING }
+nis_server_home = element home { STRING }
+inact = element inact { STRING }
+last_change = element last_change { STRING }
maps_to_serve =
element maps_to_serve {
LIST,
nis_map*
}
-max = element max { text }
+max = element max { STRING }
merge_passwd =
element merge_passwd { BOOLEAN }
merge_group =
element merge_group { BOOLEAN }
-min = element min { text }
-nis_map = element nis_map { text }
+min = element min { STRING }
+nis_map = element nis_map { STRING }
nopush =
element nopush { BOOLEAN }
y2_password_settings =
expire | flag | inact | last_change | max | min | warn
-nis_server_password_settings = element password_settings {
y2_password_settings* }
+nis_server_password_settings = element password_settings { MAP,
y2_password_settings* }
pwd_chfn =
element pwd_chfn { BOOLEAN }
pwd_chsh =
element pwd_chsh { BOOLEAN }
-pwd_srcdir = element pwd_srcdir { text }
-nis_server_netmask = element netmask { text }
-securenet = element securenet { comment?, hash?, nis_server_netmask?, network?
}
+pwd_srcdir = element pwd_srcdir { STRING }
+nis_server_netmask = element netmask { STRING }
+securenet = element securenet { MAP, (comment?, hash?, nis_server_netmask?,
network?) }
securenets =
element securenets {
LIST,
securenet*
}
-server_type = element server_type { text }
-slave = element slave { text }
+server_type = element server_type { STRING }
+slave = element slave { STRING }
slaves =
element slaves {
LIST,
@@ -70,6 +73,6 @@
element start_ypxfrd { BOOLEAN }
minuid =
element minuid { INTEGER }
-warn = element warn { text }
+warn = element warn { STRING }
# Common
-nis_server = element nis_server { y2_nisserver* }
+nis_server = element nis_server { MAP, y2_nisserver* }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/test/nis_server_test.rb
new/yast2-nis-server-4.3.0/test/nis_server_test.rb
--- old/yast2-nis-server-4.2.2/test/nis_server_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-nis-server-4.3.0/test/nis_server_test.rb 2020-05-12
16:31:20.000000000 +0200
@@ -0,0 +1,96 @@
+require_relative "test_helper"
+
+Yast.import "NisServer"
+
+describe "Yast::NisServer" do
+ subject { Yast::NisServer }
+ describe "#getMaster" do
+ it "returns nil if domain is empty" do
+ subject.domain = ""
+ expect(subject.getMaster).to eq nil
+ end
+
+ it "returns nil if domain directory does not exist" do
+ subject.domain = "test"
+ allow(Yast::SCR).to receive(:Read).with(path(".target.size"),
"/var/yp/test").and_return(-1)
+
+ expect(subject.getMaster).to eq nil
+ end
+
+ it "returns nil if domain directory is empty" do
+ subject.domain = "test"
+ allow(Yast::SCR).to receive(:Read).with(path(".target.size"),
"/var/yp/test").and_return(0)
+ allow(Yast::SCR).to receive(:Read).with(path(".target.dir"),
"/var/yp/test").and_return([])
+
+ expect(subject.getMaster).to eq nil
+ end
+
+ it "returns master server name" do
+ subject.domain = "test"
+ allow(Yast::SCR).to receive(:Read).with(path(".target.size"),
"/var/yp/test").and_return(0)
+ allow(Yast::SCR).to receive(:Read).with(path(".target.dir"),
"/var/yp/test").and_return(["a"])
+ allow(Yast::SCR).to receive(:Execute)
+ .with(
+ path(".target.bash_output"),
+ "/usr/lib/yp/makedbm -u /var/yp/test/a | grep ^YP_MASTER_NAME")
+ .and_return("exit" => 0, "stdout" => "YP_MASTER_NAME expected")
+
+ expect(subject.getMaster).to eq "expected"
+ end
+ end
+
+ describe "isYPMaster" do
+ it "returns false if master is nil" do
+ allow(subject).to receive(:getMaster).and_return(nil)
+
+ expect(subject.isYPMaster).to eq false
+ end
+
+ it "returns true if master is same as hostname" do
+ allow(subject).to receive(:getMaster).and_return("test")
+ allow(Yast::SCR).to receive(:Execute)
+ .with(
+ path(".target.bash_output"),
+ "/usr/lib/yp/yphelper --hostname")
+ .and_return("exit" => 0, "stdout" => "test")
+
+ expect(subject.isYPMaster).to eq true
+ end
+ end
+
+ describe "#SaveVariables" do
+ context ":slave is passed" do
+ it "writes default domain" do
+ subject.domain = "test"
+ expect(Yast::SCR).to receive(:Write).with(path(".etc.defaultdomain"),
"test")
+
+ subject.SaveVariables(:slave)
+ end
+ end
+
+ context ":master is passed" do
+ before do
+ allow(Yast::SCR).to receive(:Write)
+ end
+
+ it "writes default domain" do
+ subject.domain = "test"
+ expect(Yast::SCR).to receive(:Write).with(path(".etc.defaultdomain"),
"test")
+
+ subject.SaveVariables(:master)
+ end
+
+ it "writes variables to /etc/sysconfig/ypserv" do
+ expect(Yast::SCR).to receive(:Write).with(path(".sysconfig.ypserv"),
nil)
+
+ subject.SaveVariables(:master)
+ end
+
+ it "writes variables to /var/yp/Makefile" do
+ expect(Yast::SCR).to receive(:Write).with(path(".var.yp.makefile"),
nil)
+
+ subject.SaveVariables(:master)
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/test/routines_test.rb
new/yast2-nis-server-4.3.0/test/routines_test.rb
--- old/yast2-nis-server-4.2.2/test/routines_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-nis-server-4.3.0/test/routines_test.rb 2020-05-12
16:31:20.000000000 +0200
@@ -0,0 +1,29 @@
+require_relative "test_helper"
+
+class TestClass < Yast::Client
+ def initialize
+ Yast.include self, "nis_server/routines.rb"
+ end
+end
+
+describe "RoutinesInclude" do
+ subject { TestClass.new }
+
+ describe "#toboolean" do
+ it "converts value to boolean" do
+ ["true", 1, true].each do |v|
+ expect(subject.toboolean(v)).to eq true
+ end
+
+ ["false", 0, false].each do |v|
+ expect(subject.toboolean(v)).to eq false
+ end
+ end
+
+ it "returns false for unknown values" do
+ [[], {}, nil, :symbol].each do |v|
+ expect(subject.toboolean(v)).to eq false
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/test/test_helper.rb
new/yast2-nis-server-4.3.0/test/test_helper.rb
--- old/yast2-nis-server-4.2.2/test/test_helper.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-nis-server-4.3.0/test/test_helper.rb 2020-05-12
16:31:20.000000000 +0200
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+ENV["Y2DIR"] = File.expand_path("../src", __dir__)
+
+# localization agnostic tests
+ENV["LC_ALL"] = "en_US.utf-8"
+ENV["LANG"] = "en_US.utf-8"
+
+require "yast"
+require "yast/rspec"
+
+# force utf-8 encoding for external
+Encoding.default_external = Encoding::UTF_8
+
+RSpec.configure do |config|
+ config.mock_with :rspec do |mocks|
+ # If you misremember a method name both in code and in tests,
+ # will save you.
+ #
https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partial-doubles
+ #
+ # With graceful degradation for RSpec 2
+ mocks.verify_partial_doubles = true if
mocks.respond_to?(:verify_partial_doubles=)
+ end
+end
+
+if ENV["COVERAGE"]
+ require "simplecov"
+ SimpleCov.start do
+ add_filter "/test/"
+ end
+
+ src_location = File.expand_path("../src", __dir__)
+ # track all ruby files under src
+ SimpleCov.track_files("#{src_location}/**/*.rb")
+
+ # use coveralls for on-line code coverage reporting at Travis CI
+ if ENV["TRAVIS"]
+ require "coveralls"
+ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+ SimpleCov::Formatter::HTMLFormatter,
+ Coveralls::SimpleCov::Formatter
+ ]
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/testsuite/Makefile.am
new/yast2-nis-server-4.3.0/testsuite/Makefile.am
--- old/yast2-nis-server-4.2.2/testsuite/Makefile.am 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/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-nis-server-4.2.2/testsuite/tests/GetSaveList.out
new/yast2-nis-server-4.3.0/testsuite/tests/GetSaveList.out
--- old/yast2-nis-server-4.2.2/testsuite/tests/GetSaveList.out 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/testsuite/tests/GetSaveList.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Return [$["function":NisServer::YPDaemons (`none), "progress_label":"Stopping
running daemons.", "save_label":"Stop running daemons."]]
-Return [$["function":NisServer::YPGetMaps (), "progress_label":"Getting maps
from master.", "save_label":"Get maps from master."],
$["function":NisServer::SaveSecurenets (), "progress_label":"Saving hosts
allowed to query server.", "save_label":"Save hosts allowed to query server."],
$["function":NisServer::SaveVariables (`slave), "progress_label":"Setting
config variables.", "save_label":"Set config variables."],
$["function":NisServer::YPDaemons (`slave), "progress_label":"Starting
daemon.", "save_label":"Start daemon."], $["function":NisServer::Client (),
"progress_label":"Stopping NIS client.", "save_label":"Stop NIS client."]]
-Return [$["function":NisServer::SaveSecurenets (), "progress_label":"Saving
hosts allowed to query server.", "save_label":"Save hosts allowed to query
server."], $["function":NisServer::SaveVariables (`master),
"progress_label":"Setting config variables.", "save_label":"Set config
variables."], $["function":NisServer::YPDaemons (`master),
"progress_label":"Starting daemons.", "save_label":"Start daemons."],
$["function":NisServer::YPMake (), "progress_label":"Creating database.",
"save_label":"Create initial database."], $["function":NisServer::Client (),
"progress_label":"Stopping NIS client.", "save_label":"Stop NIS client."]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.2.2/testsuite/tests/SaveVariables.out
new/yast2-nis-server-4.3.0/testsuite/tests/SaveVariables.out
--- old/yast2-nis-server-4.2.2/testsuite/tests/SaveVariables.out
2020-02-28 13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/testsuite/tests/SaveVariables.out
1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Dump slave
-Write .etc.defaultdomain "thedomain" true
-Return nil
-Dump master
-Write .etc.defaultdomain "thedomain" true
-Write .sysconfig.ypserv.YPPWD_CHFN "no" true
-Write .sysconfig.ypserv.YPPWD_CHSH "no" true
-Write .sysconfig.ypserv.YPPWD_SRCDIR "/etc" true
-Write .var.yp.makefile.MERGE_PASSWD "true" true
-Write .var.yp.makefile.MINGID "0" true
-Write .var.yp.makefile.MINUID "0" true
-Write .var.yp.makefile.NOPUSH "false" true
-Write .var.yp.makefile.maps [] true
-Write .sysconfig.ypserv nil true
-Write .var.yp.makefile nil true
-Return nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.2.2/testsuite/tests/SaveVariables.rb
new/yast2-nis-server-4.3.0/testsuite/tests/SaveVariables.rb
--- old/yast2-nis-server-4.2.2/testsuite/tests/SaveVariables.rb 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/testsuite/tests/SaveVariables.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-# encoding: utf-8
-
-# YaST2: Modules testsuite
-#
-# Description:
-# Testsuite for the SaveVariables function
-#
-# Authors:
-# Dan Vesely <d...@suse.cz>
-# Martin Vidner <mvid...@suse.cz>
-#
-# $Id$
-module Yast
- class SaveVariablesClient < Client
- def main
- # testedfiles: NisServer.ycp Service.ycp Report.ycp Testsuite.ycp
-
- Yast.include self, "testsuite.rb"
-
- @READ_INIT = { "target" => { "size" => 0 } }
- @EXEC_INIT = { "target" => { "bash_output" => {} } }
-
- TESTSUITE_INIT([@READ_INIT, {}, @EXEC_INIT], nil)
-
- Yast.import "NisServer"
- Yast.include self, "nis_server/routines.rb"
-
- NisServer.start_ypbind = true
- NisServer.domain = "thedomain"
- NisServer.pwd_srcdir = "/etc"
- NisServer.merge_passwd = true
-
- DUMP("slave")
- TEST(lambda { NisServer.SaveVariables(:slave) }, [], true)
- DUMP("master")
- TEST(lambda { NisServer.SaveVariables(:master) }, [], true)
-
- nil
- end
- end
-end
-
-Yast::SaveVariablesClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/testsuite/tests/routines.out
new/yast2-nis-server-4.3.0/testsuite/tests/routines.out
--- old/yast2-nis-server-4.2.2/testsuite/tests/routines.out 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/testsuite/tests/routines.out 1970-01-01
01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-Return true
-Return false
-Return true
-Return false
-Return true
-Return false
-Return false
-Return false
-Return false
-Return false
-Dump getMaster
-Return nil
-Read .target.size "/var/yp/testdomain" -1
-Return nil
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" []
-Return nil
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" ["map1", "map2"]
-Execute .target.bash_output "/usr/lib/yp/makedbm -u
/var/yp/testdomain/map1 | grep ^YP_MASTER_NAME" $["exit":1, "stderr":"",
"stdout":""]
-Return nil
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" ["map1", "map2"]
-Execute .target.bash_output "/usr/lib/yp/makedbm -u
/var/yp/testdomain/map1 | grep ^YP_MASTER_NAME" $["exit":0, "stderr":"",
"stdout":"YP_MASTER_NAME nismaster.foo.com\n"]
-Return nismaster.foo.com
-Dump isYPMaster
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" ["map1", "map2"]
-Execute .target.bash_output "/usr/lib/yp/makedbm -u
/var/yp/testdomain/map1 | grep ^YP_MASTER_NAME" $["exit":0, "stderr":"",
"stdout":"YP_MASTER_NAME nismaster.foo.com\n"]
-Execute .target.bash_output "/usr/lib/yp/yphelper --hostname"
$["exit":1, "stderr":"", "stdout":""]
-Return false
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" ["map1", "map2"]
-Execute .target.bash_output "/usr/lib/yp/makedbm -u
/var/yp/testdomain/map1 | grep ^YP_MASTER_NAME" $["exit":0, "stderr":"",
"stdout":"YP_MASTER_NAME nismaster.foo.com\n"]
-Execute .target.bash_output "/usr/lib/yp/yphelper --hostname"
$["exit":0, "stderr":"", "stdout":"nisslave.foo.com\n"]
-Return false
-Read .target.size "/var/yp/testdomain" 42
-Read .target.dir "/var/yp/testdomain" ["map1", "map2"]
-Execute .target.bash_output "/usr/lib/yp/makedbm -u
/var/yp/testdomain/map1 | grep ^YP_MASTER_NAME" $["exit":0, "stderr":"",
"stdout":"YP_MASTER_NAME nismaster.foo.com\n"]
-Execute .target.bash_output "/usr/lib/yp/yphelper --hostname"
$["exit":0, "stderr":"", "stdout":"nismaster.foo.com\n"]
-Return true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.2/testsuite/tests/routines.rb
new/yast2-nis-server-4.3.0/testsuite/tests/routines.rb
--- old/yast2-nis-server-4.2.2/testsuite/tests/routines.rb 2020-02-28
13:20:56.000000000 +0100
+++ new/yast2-nis-server-4.3.0/testsuite/tests/routines.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-# encoding: utf-8
-
-# YaST2: Modules testsuite
-#
-# Description:
-# Testsuite for the routines.ycp include
-#
-# Authors:
-# Dan Vesely <d...@suse.cz>
-#
-# $Id$
-module Yast
- class RoutinesClient < Client
- def main
- # testedfiles: routines.ycp NisServer.ycp Testsuite.ycp
-
- Yast.include self, "testsuite.rb"
-
- @READ_INIT = { "target" => { "size" => 0 } }
- @EXEC_INIT = { "target" => { "bash_output" => {} } }
-
- TESTSUITE_INIT([@READ_INIT, {}, @EXEC_INIT], nil)
-
- Yast.import "NisServer"
- Yast.include self, "nis_server/routines.rb"
-
- # converts values to boolean
- TEST(lambda { toboolean("true") }, [], nil)
- TEST(lambda { toboolean("false") }, [], nil)
- TEST(lambda { toboolean(1) }, [], nil)
- TEST(lambda { toboolean(0) }, [], nil)
- TEST(lambda { toboolean(true) }, [], nil)
- TEST(lambda { toboolean(false) }, [], nil)
-
- # all other values are false
- TEST(lambda { toboolean([]) }, [], nil)
- TEST(lambda { toboolean({}) }, [], nil)
- TEST(lambda { toboolean(nil) }, [], nil)
- TEST(lambda { toboolean(:symbol) }, [], nil)
-
- DUMP("getMaster")
- # no domain
- NisServer.domain = ""
- TEST(lambda { NisServer.getMaster }, [], nil)
- # no map dir
- NisServer.domain = "testdomain"
- TEST(lambda { NisServer.getMaster }, [], -1) # .target.size
- # no maps in dir
- @READ = { "target" => { "size" => 42, "dir" => [] } }
- TEST(lambda { NisServer.getMaster }, [@READ], nil)
- # no master entry in map
- @READ = { "target" => { "size" => 42, "dir" => ["map1", "map2"] } }
- @EXECFAIL = {
- "target" => {
- "bash_output" => { "exit" => 1, "stdout" => "", "stderr" => "" }
- }
- }
- TEST(lambda { NisServer.getMaster }, [@READ, {}, @EXECFAIL], nil)
- # all ok
- @EXEC1 = {
- "target" => {
- "bash_output" => {
- "exit" => 0,
- "stdout" => "YP_MASTER_NAME nismaster.foo.com\n",
- "stderr" => ""
- }
- }
- }
- TEST(lambda { NisServer.getMaster }, [@READ, {}, @EXEC1], nil)
-
- # this test depends on the values of READ, EXEC1 and EXECFAIL set above!
- DUMP("isYPMaster")
- # failure
- TEST(lambda { NisServer.isYPMaster }, [@READ, {}, [@EXEC1, @EXECFAIL]],
nil)
- # not a master
- @EXEC2 = {
- "target" => {
- "bash_output" => {
- "exit" => 0,
- "stdout" => "nisslave.foo.com\n",
- "stderr" => ""
- }
- }
- }
- TEST(lambda { NisServer.isYPMaster }, [@READ, {}, [@EXEC1, @EXEC2]], nil)
- # master
- @EXEC2 = {
- "target" => {
- "bash_output" => {
- "exit" => 0,
- "stdout" => "nismaster.foo.com\n",
- "stderr" => ""
- }
- }
- }
- TEST(lambda { NisServer.isYPMaster }, [@READ, {}, [@EXEC1, @EXEC2]], nil)
-
- nil
- end
- end
-end
-
-Yast::RoutinesClient.new.main
