Skip to content

Commit

Permalink
Merge branch 'master' into feature/service-widget
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgdavid
dgdavid authored Aug 10, 2018
2 parents 489def5 + 09ffd50 commit fff997c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 27 deletions.
9 changes: 8 additions & 1 deletion package/yast2-dhcp-server.changes
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
-------------------------------------------------------------------
Tue Aug 7 12:00:22 UTC 2018 - dgonzalez@suse.com

- Use CWM::ServiceWidget to manage the service status (part of fate#319428).
- Use CWM::ServiceWidget to manage the service status
(part of fate#319428).
- 4.1.0

-------------------------------------------------------------------
Fri Aug 3 09:39:35 UTC 2018 - igonzalezsosa@suse.com

- Fix package building with yast2 4.0.80 (bsc#1103691).
- 4.0.2

-------------------------------------------------------------------
Thu Jun 28 09:44:54 CEST 2018 - schubi@suse.de

Expand Down
16 changes: 8 additions & 8 deletions testsuite/tests/Write.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
Write .sysconfig.dhcpd.DHCPD_INTERFACE "" true
Write .sysconfig.dhcpd.DHCPD_OTHER_ARGS "" true
Write .sysconfig.dhcpd nil true
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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 ===============================
Expand All @@ -22,14 +22,14 @@ Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "yes" true
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_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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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 show dhcpd.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload --property=TriggeredBy " $["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
6 changes: 3 additions & 3 deletions testsuite/tests/YaPIAddDeclaration.out
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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"]
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 --property=CanReload --property=TriggeredBy " $["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"
Expand All @@ -14,7 +14,7 @@ Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
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_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"]
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 --property=CanReload --property=TriggeredBy " $["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 --property=CanReload --property=TriggeredBy " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
Return true
Dump ==========================================================
12 changes: 6 additions & 6 deletions testsuite/tests/YaPIDeleteDeclartion.out
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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"]
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 --property=CanReload --property=TriggeredBy " $["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"
Expand All @@ -14,13 +14,13 @@ Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
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_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"]
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 --property=CanReload --property=TriggeredBy " $["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 --property=CanReload --property=TriggeredBy " $["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"]
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 --property=CanReload --property=TriggeredBy " $["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"
Expand All @@ -33,7 +33,7 @@ Write .sysconfig.dhcpd.DHCPD_RUN_CHROOTED "no" true
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_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"]
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 --property=CanReload --property=TriggeredBy " $["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 --property=CanReload --property=TriggeredBy " $["exit":0, "stderr":"localhost", "stdout":"localhost"]
Return true
Dump ==========================================================
Loading

0 comments on commit fff997c

Please sign in to comment.