Benjamin Gilbert 2 gadi atpakaļ
vecāks
revīzija
140a7b6901
2 mainītis faili ar 15 papildinājumiem un 5 dzēšanām
  1. 3 1
      iptables/iptables.go
  2. 12 4
      iptables/iptables_test.go

+ 3 - 1
iptables/iptables.go

@@ -510,7 +510,9 @@ func (ipt *IPTables) runWithOutput(args []string, stdout io.Writer) error {
 			syscall.Close(fmu.fd)
 			return err
 		}
-		defer ul.Unlock()
+		defer func() {
+			_ = ul.Unlock()
+		}()
 	}
 
 	var stderr bytes.Buffer

+ 12 - 4
iptables/iptables_test.go

@@ -473,8 +473,12 @@ func TestIsNotExist(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer func() {
-		ipt.ClearChain("filter", chainName)
-		ipt.DeleteChain("filter", chainName)
+		if err := ipt.ClearChain("filter", chainName); err != nil {
+			t.Fatal(err)
+		}
+		if err := ipt.DeleteChain("filter", chainName); err != nil {
+			t.Fatal(err)
+		}
 	}()
 
 	err = ipt.Append("filter", chainName, "-p", "tcp", "-j", "DROP")
@@ -542,8 +546,12 @@ func TestIsNotExistForIPv6(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer func() {
-		ipt.ClearChain("filter", chainName)
-		ipt.DeleteChain("filter", chainName)
+		if err := ipt.ClearChain("filter", chainName); err != nil {
+			t.Fatal(err)
+		}
+		if err := ipt.DeleteChain("filter", chainName); err != nil {
+			t.Fatal(err)
+		}
 	}()
 
 	err = ipt.Append("filter", chainName, "-p", "tcp", "-j", "DROP")