Merge f04461d into 470ed16

yast · Nov 28, 2019 · beb840b · beb840b
2 parents 470ed16 + f04461d
commit beb840b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git 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 <kanderssen@suse.com>
+
+- 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 <kanderssen@suse.com>
 

diff --git 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

diff --git 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
@@ -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"