Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2014-09-19 13:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2014-08-08 10:13:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2014-09-19 15:45:42.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 08:28:57 UTC 2014 - [email protected] + +- Adapted to use systemd to manage the dhcpd service (bnc#892342) +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-3.1.3.tar.bz2 New: ---- yast2-dhcp-server-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.ndAu2c/_old 2014-09-19 15:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ndAu2c/_new 2014-09-19 15:45:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-dhcp-server-3.1.3.tar.bz2 -> yast2-dhcp-server-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/MAINTAINER new/yast2-dhcp-server-3.1.4/MAINTAINER --- old/yast2-dhcp-server-3.1.3/MAINTAINER 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/MAINTAINER 2014-09-19 10:57:12.000000000 +0200 @@ -1 +1 @@ -Michal Filka <[email protected]> +Deprecated file. Use `osc maintainer yast2-dhcp-server` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.changes new/yast2-dhcp-server-3.1.4/package/yast2-dhcp-server.changes --- old/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.changes 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/package/yast2-dhcp-server.changes 2014-09-19 10:57:12.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 19 08:28:57 UTC 2014 - [email protected] + +- Adapted to use systemd to manage the dhcpd service (bnc#892342) +- 3.1.4 + +------------------------------------------------------------------- Thu Aug 7 08:36:22 UTC 2014 - [email protected] - bnc#887139 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.spec new/yast2-dhcp-server-3.1.4/package/yast2-dhcp-server.spec --- old/yast2-dhcp-server-3.1.3/package/yast2-dhcp-server.spec 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/package/yast2-dhcp-server.spec 2014-09-19 10:57:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/src/modules/DhcpServer.pm new/yast2-dhcp-server-3.1.4/src/modules/DhcpServer.pm --- old/yast2-dhcp-server-3.1.3/src/modules/DhcpServer.pm 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/src/modules/DhcpServer.pm 2014-09-19 10:57:12.000000000 +0200 @@ -22,6 +22,7 @@ #use check_routines; our %TYPEINFO; +our $SERVICE = "dhcpd"; # persistent variables @@ -1490,7 +1491,7 @@ Progress->NextStage (); - $start_service = Service->Enabled ("dhcpd"); + $start_service = Service->Enabled ($SERVICE); y2milestone ("Service start: $start_service"); $chroot = ((SCR->Read (".sysconfig.dhcpd.DHCPD_RUN_CHROOTED")||"") ne "no") ? 1 @@ -1736,13 +1737,13 @@ if ($start_service) { y2milestone ("Enabling the DHCP service"); - my $ret = 0; + my $ret = 1; if (! $write_only) { - $ret = SCR->Execute (".target.bash", "/etc/init.d/dhcpd restart"); + $ret = Service->Restart ($SERVICE); } - Service->Enable ("dhcpd"); - if (0 != $ret) + Service->Enable ($SERVICE); + if (!$ret) { # error report Report->Error (__("Error occurred while restarting the DHCP daemon.")); @@ -1754,9 +1755,9 @@ y2milestone ("Disabling the DHCP service"); if (! $write_only) { - SCR->Execute (".target.bash", "/etc/init.d/dhcpd stop"); + Service->Stop ($SERVICE); } - Service->Disable ("dhcpd"); + Service->Disable ($SERVICE); } Progress->NextStage (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/src/modules/YaPI/DHCPD.pm new/yast2-dhcp-server-3.1.4/src/modules/YaPI/DHCPD.pm --- old/yast2-dhcp-server-3.1.3/src/modules/YaPI/DHCPD.pm 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/src/modules/YaPI/DHCPD.pm 2014-09-19 10:57:12.000000000 +0200 @@ -73,6 +73,7 @@ our $VERSION='1.0.0'; our @CAPABILITIES = ('SLES9'); our %TYPEINFO; +our $SERVICE = "dhcpd"; use strict; use Errno qw(ENOENT); @@ -106,8 +107,7 @@ my $self = shift; my $config_options = shift; - return 0 == SCR->Execute (".target.bash", - "/etc/init.d/dhcpd stop"); + return Service->Stop($SERVICE); } =item * @@ -135,8 +135,7 @@ my $self = shift; my $config_options = shift; - return 0 == SCR->Execute (".target.bash", - "/etc/init.d/dhcpd restart"); + return Service->Restart($SERVICE); } =item * @@ -164,8 +163,7 @@ my $self = shift; my $config_options = shift; - return 0 == SCR->Execute (".target.bash", - "/etc/init.d/dhcpd status") ? 1 : 0; + return Service->Active($SERVICE); } =item * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/test/yapi_dhcpd_test.rb new/yast2-dhcp-server-3.1.4/test/yapi_dhcpd_test.rb --- old/yast2-dhcp-server-3.1.3/test/yapi_dhcpd_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-dhcp-server-3.1.4/test/yapi_dhcpd_test.rb 2014-09-19 10:57:12.000000000 +0200 @@ -0,0 +1,54 @@ +#!/usr/bin/env rspec + +require 'rspec' +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) +require "yast" + +module Yast + import "YaPI::DHCPD" + import "Service" + + describe YaPI::DHCPD do + describe ".StartDhcpService" do + let(:result) { YaPI::DHCPD.StartDhcpService({}) } + + it "delegates to Service.Restart and reports success back" do + expect(Service).to receive(:Restart).with("dhcpd").and_return true + expect(result).to eql(true) + end + + it "delegates to Service.Restart and reports failure back" do + expect(Service).to receive(:Restart).with("dhcpd").and_return false + expect(result).to eql(false) + end + end + + describe ".StopDhcpService" do + let(:result) { YaPI::DHCPD.StopDhcpService({}) } + + it "delegates to Service.Stop and reports success back" do + expect(Service).to receive(:Stop).with("dhcpd").and_return true + expect(result).to eql(true) + end + + it "delegates to Service.Stop and reports failure back" do + expect(Service).to receive(:Stop).with("dhcpd").and_return false + expect(result).to eql(false) + end + end + + describe ".GetDhcpServiceStatus" do + let(:result) { YaPI::DHCPD.GetDhcpServiceStatus({}) } + + it "delegates to Service.Active and properly reports a running system" do + expect(Service).to receive(:Active).with("dhcpd").and_return true + expect(result).to eql(true) + end + + it "delegates to Service.Active and properly reports a stopped system" do + expect(Service).to receive(:Active).with("dhcpd").and_return false + expect(result).to eql(false) + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/Write.out new/yast2-dhcp-server-3.1.4/testsuite/tests/Write.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/Write.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/Write.out 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,16 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 0 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password disable dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] Return true Dump =============================== Return nil @@ -13,5 +22,14 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 0 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password disable dhcpd.service " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled dhcpd.service " $["exit":0, "stderr":"", "stdout":""] Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/Write.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/Write.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/Write.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/Write.rb 2014-09-19 10:57:12.000000000 +0200 @@ -19,7 +19,7 @@ def main Yast.include self, "testsuite.rb" - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb TESTSUITE_INIT([], nil) Yast.import "Progress" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIAddDeclaration.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIAddDeclaration.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIAddDeclaration.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIAddDeclaration.out 2014-09-19 10:57:12.000000000 +0200 @@ -1,6 +1,7 @@ Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -13,6 +14,7 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIAddDeclaration.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIAddDeclaration.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIAddDeclaration.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIAddDeclaration.rb 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,7 @@ module Yast class YaPIAddDeclarationClient < Client def main - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb Yast.include self, "testsuite.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIDeleteDeclartion.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIDeleteDeclartion.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIDeleteDeclartion.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIDeleteDeclartion.out 2014-09-19 10:57:12.000000000 +0200 @@ -1,6 +1,7 @@ Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -13,11 +14,13 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -30,6 +33,7 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIDeleteDeclartion.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIDeleteDeclartion.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIDeleteDeclartion.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIDeleteDeclartion.rb 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,7 @@ module Yast class YaPIDeleteDeclartionClient < Client def main - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb Yast.include self, "testsuite.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationDirectives.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationDirectives.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationDirectives.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationDirectives.out 2014-09-19 10:57:12.000000000 +0200 @@ -1,6 +1,7 @@ Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -13,6 +14,7 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationDirectives.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationDirectives.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationDirectives.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationDirectives.rb 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,7 @@ module Yast class YaPISetDeclarationDirectivesClient < Client def main - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb Yast.include self, "testsuite.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationOptions.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationOptions.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationOptions.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationOptions.out 2014-09-19 10:57:12.000000000 +0200 @@ -1,6 +1,7 @@ Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -13,6 +14,7 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationOptions.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationOptions.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationOptions.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationOptions.rb 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,7 @@ module Yast class YaPISetDeclarationOptionsClient < Client def main - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb Yast.include self, "testsuite.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationParent.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationParent.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationParent.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationParent.out 2014-09-19 10:57:12.000000000 +0200 @@ -1,6 +1,7 @@ Dump ========================================================== Execute .target.bash_output "/bin/hostname --short" $["exit":0, "stderr":"localhost", "stdout":"localhost"] Execute .target.bash_output "/bin/hostname --fqdn" $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Read .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" Read .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" Read .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" @@ -13,6 +14,7 @@ Write .sysconfig.dhcpd.DHCPD_INTERFACE "eth0 eth2" true Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "-p 111" true Write .sysconfig.dhcpd nil true -Execute .target.bash "/etc/init.d/dhcpd stop" 1 +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"localhost", "stdout":"localhost"] Return true Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationParent.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationParent.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPISetDeclarationParent.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPISetDeclarationParent.rb 2014-09-19 10:57:12.000000000 +0200 @@ -3,7 +3,7 @@ module Yast class YaPISetDeclarationParentClient < Client def main - # testedfiles: DhcpServer.pm + # testedfiles: DhcpServer.pm systemctl.rb Yast.include self, "testsuite.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIStartStopDhcpService.out new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIStartStopDhcpService.out --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIStartStopDhcpService.out 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIStartStopDhcpService.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -Dump ========================================================== -Execute .target.bash "/etc/init.d/dhcpd restart" 0 -Return true -Dump ========================================================== -Execute .target.bash "/etc/init.d/dhcpd stop" 0 -Return true -Dump ========================================================== -Execute .target.bash "/etc/init.d/dhcpd status" 0 -Return true -Dump ========================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIStartStopDhcpService.rb new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIStartStopDhcpService.rb --- old/yast2-dhcp-server-3.1.3/testsuite/tests/YaPIStartStopDhcpService.rb 2014-08-07 14:47:44.000000000 +0200 +++ new/yast2-dhcp-server-3.1.4/testsuite/tests/YaPIStartStopDhcpService.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -# encoding: utf-8 - -module Yast - class YaPIStartStopDhcpServiceClient < Client - def main - # testedfiles: DHCPD.pm - - Yast.include self, "testsuite.rb" - - Yast.import "YaPI::DHCPD" - Yast.import "Mode" - - Mode.SetTest("testsuite") - - DUMP("==========================================================") - TEST(lambda { YaPI::DHCPD.StartDhcpService({}) }, [], nil) - DUMP("==========================================================") - TEST(lambda { YaPI::DHCPD.StopDhcpService({}) }, [], nil) - DUMP("==========================================================") - TEST(lambda { YaPI::DHCPD.GetDhcpServiceStatus({}) }, [], nil) - DUMP("==========================================================") - - nil - end - end -end - -Yast::YaPIStartStopDhcpServiceClient.new.main -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
