Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openshift/kubernetes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 934687da9c322d0f75f6a99dd1e191cc0dcb0829
Choose a base ref
..
head repository: openshift/kubernetes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d5291cc63b7b3655b11bc15e8afb9a078049d09
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +1 −1 pkg/util/iptables/iptables.go
  2. +3 −3 pkg/util/iptables/iptables_test.go
2 changes: 1 addition & 1 deletion pkg/util/iptables/iptables.go
View file
Original file line number Diff line number Diff line change
@@ -571,7 +571,7 @@ func getIPTablesRestoreWaitFlag(exec utilexec.Interface) []string {
return nil
}

return []string{WaitSecondsString}
return []string{"--wait=2"}
}

// getIPTablesRestoreVersionString runs "iptables-restore --version" to get the version string
6 changes: 3 additions & 3 deletions pkg/util/iptables/iptables_test.go
View file
Original file line number Diff line number Diff line change
@@ -1054,7 +1054,7 @@ func TestRestoreAllWait(t *testing.T) {
}

commandSet := sets.NewString(fcmd.CombinedOutputLog[2]...)
if !commandSet.HasAll("iptables-restore", WaitSecondsString, "--counters", "--noflush") {
if !commandSet.HasAll("iptables-restore", "--wait=2", "--counters", "--noflush") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
}

@@ -1103,8 +1103,8 @@ func TestRestoreAllWaitOldIptablesRestore(t *testing.T) {
if !commandSet.HasAll("iptables-restore", "--counters", "--noflush") {
t.Errorf("wrong CombinedOutput() log, got %s", fcmd.CombinedOutputLog[2])
}
if commandSet.HasAny(WaitSecondsString) {
t.Errorf("wrong CombinedOutput() log (unexpected %s option), got %s", WaitSecondsString, fcmd.CombinedOutputLog[2])
if commandSet.HasAny("--wait=2") {
t.Errorf("wrong CombinedOutput() log (unexpected --wait=2 option), got %s", fcmd.CombinedOutputLog[2])
}

if fcmd.CombinedOutputCalls != 3 {