From ba93bb928f9f70881df17c677c0326fb4627f568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 28 Nov 2019 14:34:26 +0000 Subject: [PATCH 1/2] Import Directory in GetServiceStatus test --- testsuite/YaPI/tests/YaPI-GetServiceStatus.out | 1 - testsuite/YaPI/tests/YaPI-GetServiceStatus.rb | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testsuite/YaPI/tests/YaPI-GetServiceStatus.out b/testsuite/YaPI/tests/YaPI-GetServiceStatus.out index c6e25aa..5eee059 100644 --- a/testsuite/YaPI/tests/YaPI-GetServiceStatus.out +++ b/testsuite/YaPI/tests/YaPI-GetServiceStatus.out @@ -1,5 +1,4 @@ Return Disabled service -Read .target.tmpdir "/tmp" Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 /usr/bin/systemctl --no-legend --no-pager --no-ask-password show smb.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath --property=CanReload " $["exit":0, "stderr":"", "stdout":""] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 /usr/bin/systemctl --no-legend --no-pager --no-ask-password is-enabled smb.service " $["exit":0, "stderr":"", "stdout":""] Return 0 diff --git a/testsuite/YaPI/tests/YaPI-GetServiceStatus.rb b/testsuite/YaPI/tests/YaPI-GetServiceStatus.rb index c7d30c0..0beb8b8 100644 --- a/testsuite/YaPI/tests/YaPI-GetServiceStatus.rb +++ b/testsuite/YaPI/tests/YaPI-GetServiceStatus.rb @@ -7,6 +7,10 @@ def main # $Id$ Yast.import "SambaConfig" + # Import "Directory" just for avoid its initialization which reads the + # ".target.tmpdir". This change was consequence of bsc#1151291, which added + # an import of "Systemd" in Y2Network::Systemd::Unit + Yast.import "Directory" Yast.include self, "testsuite.rb" Yast.include self, "tests-common.rb" From f04461d7de08fc039f4e711933b67ad6129bdf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 28 Nov 2019 14:41:14 +0000 Subject: [PATCH 2/2] Bump version & changelog --- package/yast2-samba-server.changes | 7 +++++++ package/yast2-samba-server.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-samba-server.changes b/package/yast2-samba-server.changes index 315827d..f4e3e02 100644 --- a/package/yast2-samba-server.changes +++ b/package/yast2-samba-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 28 14:35:11 UTC 2019 - Knut Anderssen + +- Fix failing Samba.GetServiceStatus old testsuite forcing and + import of 'Directory' (bsc#1155923) +- 4.2.2 + ------------------------------------------------------------------- Mon Nov 11 14:56:40 UTC 2019 - Knut Anderssen diff --git a/package/yast2-samba-server.spec b/package/yast2-samba-server.spec index 079817a..67f2b88 100644 --- a/package/yast2-samba-server.spec +++ b/package/yast2-samba-server.spec @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 4.2.1 +Version: 4.2.2 Release: 0 Url: https://github.com/yast/yast-samba-server Summary: YaST2 - Samba Server Configuration