Merge pull request #54 from teclator/susefirewall_replacement

Testsuite fix for SuSEFirewall replacement. (fate#323460)

.gitignore

@@ -25,3 +25,9 @@ test/*.log
 test/*.trs
 testsuite/*.bak
 /testsuite/raw.*
+doc/
+.yardoc/*
+coverage/
+.yardoc/
+doc/autodocs
+*.pot

README.md

@@ -1,5 +1,7 @@
 # YaST - The NFS Client Module #
 
+[![Coverage
+Status](https://coveralls.io/repos/github/yast/yast-nfs-client/badge.svg?branch=master)](https://coveralls.io/github/yast/yast-nfs-client?branch=master)
 [![Travis Build](https://travis-ci.org/yast/yast-nfs-client.svg?branch=master)](https://travis-ci.org/yast/yast-nfs-client)
 [![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-nfs-client-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-nfs-client-master/)
 

package/yast2-nfs-client.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  3 18:20:20 UTC 2017 - knut.anderssen@suse.com
+
+- Fix teststuite once SuSEFirewall2 is bein replaced by Firewalld
+  (fate#323460)
+- 4.0.0
+
 -------------------------------------------------------------------
 Mon Jun  6 07:39:33 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-nfs-client.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        3.1.17
+Version:        4.0.0
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 

testsuite/tests/autoyast.out

@@ -1,4 +1,5 @@
 Read	.target.tmpdir "/tmp"
+Execute	.target.bash "rpm -q --whatprovides firewalld" 1
 Dump	Nfs::Import
 Dump	- basic, SLE11-SP2
 Read	.sysconfig.nfs.NFS4_SUPPORT "no"

testsuite/tests/autoyast.rb

@@ -6,7 +6,14 @@ def main
       Yast.include self, "testsuite.rb"
       @I_READ = { "target" => { "tmpdir" => "/tmp" } }
       @I_WRITE = {}
-      @I_EXEC = {}
+      # Firewalld rpm not installed
+      @I_EXEC = {
+        "target" => {
+          "bash"        => 1,
+          "bash_output" => { "exit" => 0, "stdout" => "", "stderr" => "" }
+        }
+      }
+
       TESTSUITE_INIT([@I_READ, @I_WRITE, @I_EXEC], nil)
 
       @READ = {