Browse Source

libnetwork/iptables: TestPassthrough(): skip without firewalld

The test was not doing anything without firewalld running, but did
not skip either.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 years ago
parent
commit
b216669a02
1 changed files with 9 additions and 9 deletions
  1. 9 9
      libnetwork/iptables/firewalld_test.go

+ 9 - 9
libnetwork/iptables/firewalld_test.go

@@ -75,6 +75,9 @@ func TestReloaded(t *testing.T) {
 }
 }
 
 
 func TestPassthrough(t *testing.T) {
 func TestPassthrough(t *testing.T) {
+	if !firewalldRunning {
+		t.Skip("firewalld is not running")
+	}
 	rule1 := []string{
 	rule1 := []string{
 		"-i", "lo",
 		"-i", "lo",
 		"-p", "udp",
 		"-p", "udp",
@@ -82,14 +85,11 @@ func TestPassthrough(t *testing.T) {
 		"-j", "ACCEPT",
 		"-j", "ACCEPT",
 	}
 	}
 
 
-	iptable := GetIptable(IPv4)
-	if firewalldRunning {
-		_, err := Passthrough(Iptables, append([]string{"-A"}, rule1...)...)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !iptable.Exists(Filter, "INPUT", rule1...) {
-			t.Fatal("rule1 does not exist")
-		}
+	_, err := Passthrough(Iptables, append([]string{"-A"}, rule1...)...)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !GetIptable(IPv4).Exists(Filter, "INPUT", rule1...) {
+		t.Fatal("rule1 does not exist")
 	}
 	}
 }
 }