Просмотр исходного кода

Fixed the tests.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Madhu Venugopal 10 лет назад
Родитель
Сommit
3a8213e40a
1 измененных файлов с 4 добавлено и 14 удалено
  1. 4 14
      libnetwork/iptables/iptables_test.go

+ 4 - 14
libnetwork/iptables/iptables_test.go

@@ -131,16 +131,11 @@ func TestPrerouting(t *testing.T) {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
 
 
-	rule := []string{
-		"-j", natChain.Name}
-
-	rule = append(rule, args...)
-
-	if !Exists(natChain.Table, "PREROUTING", rule...) {
+	if !Exists(natChain.Table, "PREROUTING", args...) {
 		t.Fatalf("rule does not exist")
 		t.Fatalf("rule does not exist")
 	}
 	}
 
 
-	delRule := append([]string{"-D", "PREROUTING", "-t", string(Nat)}, rule...)
+	delRule := append([]string{"-D", "PREROUTING", "-t", string(Nat)}, args...)
 	if _, err = Raw(delRule...); err != nil {
 	if _, err = Raw(delRule...); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
@@ -156,17 +151,12 @@ func TestOutput(t *testing.T) {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
 
 
-	rule := []string{
-		"-j", natChain.Name}
-
-	rule = append(rule, args...)
-
-	if !Exists(natChain.Table, "OUTPUT", rule...) {
+	if !Exists(natChain.Table, "OUTPUT", args...) {
 		t.Fatalf("rule does not exist")
 		t.Fatalf("rule does not exist")
 	}
 	}
 
 
 	delRule := append([]string{"-D", "OUTPUT", "-t",
 	delRule := append([]string{"-D", "OUTPUT", "-t",
-		string(natChain.Table)}, rule...)
+		string(natChain.Table)}, args...)
 	if _, err = Raw(delRule...); err != nil {
 	if _, err = Raw(delRule...); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}