Skip to content

Remove redefinitions of loop variables in for-loops. #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atombrella wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove redefinitions of loop variables in for-loops. #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions plugins/ipam/dhcp/dhcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,6 @@ var _ = Describe("DHCP Operations", func() {
})

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] configures and deconfigures a link with ADD/DEL", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "%s",
Expand Down Expand Up @@ -579,10 +575,6 @@ var _ = Describe("DHCP Lease Unavailable Operations", func() {
})

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] configures multiple links with multiple ADD with second lease unavailable", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "%s",
Expand Down
4 changes: 0 additions & 4 deletions plugins/ipam/host-local/host_local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ var _ = Describe("host-local Operations", func() {
})

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] allocates and releases addresses with ADD/DEL", ver), func() {
err := os.WriteFile(filepath.Join(tmpDir, "resolv.conf"), []byte("nameserver 192.0.2.3"), 0o644)
Expect(err).NotTo(HaveOccurred())
Expand Down
4 changes: 0 additions & 4 deletions plugins/ipam/static/static_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ import (

var _ = Describe("static Operations", func() {
for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] allocates and releases addresses with ADD/DEL", ver), func() {
const ifname string = "eth0"
const nspath string = "/some/where"
Expand Down
17 changes: 0 additions & 17 deletions plugins/main/bridge/bridge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,10 +1910,6 @@ var _ = Describe("bridge Operations", func() {
)

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] creates a bridge", ver), func() {
conf := testCase{cniVersion: ver}.netConf()
err := originalNS.Do(func(ns.NetNS) error {
Expand Down Expand Up @@ -2012,8 +2008,6 @@ var _ = Describe("bridge Operations", func() {
resolvConf: resolvConf,
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) configures and deconfigures a bridge and veth with default route with ADD/DEL", ver, i), func() {
tc.cniVersion = ver
cmdAddDelTest(originalNS, targetNS, tc, dataDir)
Expand Down Expand Up @@ -2136,8 +2130,6 @@ var _ = Describe("bridge Operations", func() {
DelErr010: "CNI version 0.1.0 does not support more than 1 address per family",
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) configures and deconfigures a bridge, veth with default route and vlanID 100 with ADD/DEL", ver, i), func() {
tc.cniVersion = ver
cmdAddDelTest(originalNS, targetNS, tc, dataDir)
Expand Down Expand Up @@ -2172,8 +2164,6 @@ var _ = Describe("bridge Operations", func() {
},
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) configures and deconfigures a bridge and veth with default route with ADD/DEL", ver, i), func() {
tc.cniVersion = ver
cmdAddDelTest(originalNS, targetNS, tc, dataDir)
Expand Down Expand Up @@ -2217,8 +2207,6 @@ var _ = Describe("bridge Operations", func() {
gwCIDRSecond: "fd00:1234::1/64",
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) ensure bridge address", ver, i), func() {
conf := testCase{cniVersion: ver, isGW: true}.netConf()

Expand Down Expand Up @@ -2353,8 +2341,6 @@ var _ = Describe("bridge Operations", func() {
subnet: "2001:db8:42::/64",
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) creates a bridge with a stable MAC addresses", ver, i), func() {
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
Expand Down Expand Up @@ -2496,7 +2482,6 @@ var _ = Describe("bridge Operations", func() {
cniVersion: ver,
},
} {
tc := tc
It(fmt.Sprintf("[%s] configures a bridge and ipMasq rules with ipMasqBackend %q", ver, tc.ipMasqBackend), func() {
err := originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
Expand Down Expand Up @@ -2575,8 +2560,6 @@ var _ = Describe("bridge Operations", func() {
},
},
} {
tc := tc
i := i
It(fmt.Sprintf("[%s] (%d) configures and deconfigures a bridge and veth with default route with ADD/DEL/CHECK", ver, i), func() {
tc.cniVersion = ver
cmdAddDelCheckTest(originalNS, targetNS, tc, dataDir)
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/dummy/dummy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ var _ = Describe("dummy Operations", func() {
})

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] creates an dummy link in a non-default namespace", ver), func() {
// Create dummy in other namespace
err := originalNS.Do(func(ns.NetNS) error {
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/host-device/host-device_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,6 @@ var _ = Describe("base functionality", func() {
})

for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] works with a valid config without IPAM", ver), func() {
var origLink netlink.Link

Expand Down
3 changes: 0 additions & 3 deletions plugins/main/ipvlan/ipvlan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ var _ = Describe("ipvlan Operations", func() {
}
// for _, ver := range testutils.AllSpecVersions {
for _, ver := range [...]string{"1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver
isInContainer := inContainer // Tests need a local var with constant value

It(fmt.Sprintf("[%s] creates an ipvlan link in a non-default namespace", ver), func() {
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/loopback/loopback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ var _ = Describe("Loopback", func() {
})

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Context("when given a network namespace", func() {
It(fmt.Sprintf("[%s] sets the lo device to UP", ver), func() {
command.Stdin = generateConfig(ver)
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/macvlan/macvlan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,6 @@ var _ = Describe("macvlan Operations", func() {
linkInContainer = fmt.Sprintf("\"linkInContainer\": %t,", *isInContainer)
}
for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] creates an macvlan link in a non-default namespace", ver), func() {
conf := &NetConf{
NetConf: types.NetConf{
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/ptp/ptp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,6 @@ var _ = Describe("ptp Operations", func() {
}

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] configures and deconfigures a ptp link with ADD/DEL", ver), func() {
dnsConf := types.DNS{
Nameservers: []string{"10.1.2.123"},
Expand Down
2 changes: 0 additions & 2 deletions plugins/main/tap/tap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ var _ = Describe("Add, check, remove tap plugin", func() {
})

for _, ver := range testutils.AllSpecVersions {
ver := ver

It(fmt.Sprintf("[%s] add, check and remove a tap device run correctly", ver), func() {
conf := fmt.Sprintf(`{
"cniVersion": "%s",
Expand Down
4 changes: 0 additions & 4 deletions plugins/main/vlan/vlan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,6 @@ var _ = Describe("vlan Operations", func() {
isInContainer := inContainer // Tests need a local var with constant value

for _, ver := range testutils.AllSpecVersions {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] creates an vlan link in a non-default namespace with given MTU", ver), func() {
conf := &NetConf{
NetConf: types.NetConf{
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/bandwidth/bandwidth_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ var _ = Describe("bandwidth test", func() {
// Bandwidth requires host-side interface info, and thus only
// supports 0.3.0 and later CNI versions
for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Describe("cmdADD", func() {
It(fmt.Sprintf("[%s] works with a Veth pair", ver), func() {
conf := fmt.Sprintf(`{
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/firewall/firewall_firewalld_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,6 @@ var _ = Describe("firewalld test", func() {
// firewall plugin requires a prevResult and thus only supports 0.3.0
// and later CNI versions
for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] works with a config", ver), func() {
Expect(isFirewalldRunning()).To(BeTrue())

Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/firewall/firewall_iptables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,6 @@ var _ = Describe("firewall plugin iptables backend", func() {
// firewall plugin requires a prevResult and thus only supports 0.3.0
// and later CNI versions
for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] passes prevResult through unchanged", ver), func() {
fullConf := makeIptablesConf(ver)
args := &skel.CmdArgs{
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/portmap/portmap_integ_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ var _ = Describe("portmap integration tests", func() {
})

for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Describe("Creating an interface in a namespace with the ptp plugin", func() {
// This needs to be done using Ginkgo's asynchronous testing mode.
It(fmt.Sprintf("[%s] forwards a TCP port on ipv4", ver), func(done Done) {
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/portmap/portmap_iptables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ var _ = Describe("portmapping configuration (iptables)", func() {
containerID := "icee6giejonei6sohng6ahngee7laquohquee9shiGo7fohferakah3Feiyoolu2pei7ciPhoh7shaoX6vai3vuf0ahfaeng8yohb9ceu0daez5hashee8ooYai5wa3y"

for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Describe("Generating iptables chains", func() {
Context("for DNAT", func() {
It(fmt.Sprintf("[%s] generates a correct standard container chain", ver), func() {
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/portmap/portmap_nftables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ var _ = Describe("portmapping configuration (nftables)", func() {
Expect(err).NotTo(HaveOccurred())

for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Describe("nftables rules", func() {
var pmNFT *portMapperNFTables
var ipv4Fake, ipv6Fake *knftables.Fake
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/portmap/portmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ import (

var _ = Describe("portmapping configuration", func() {
for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

Context("config parsing", func() {
It(fmt.Sprintf("[%s] correctly parses an ADD config", ver), func() {
configBytes := []byte(fmt.Sprintf(`{
Expand Down
4 changes: 0 additions & 4 deletions plugins/meta/tuning/tuning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@ var _ = Describe("tuning plugin", func() {
})

for _, ver := range []string{"0.3.0", "0.3.1", "0.4.0", "1.0.0"} {
// Redefine ver inside for scope so real value is picked up by each dynamically defined It()
// See Gingkgo's "Patterns for dynamically generating tests" documentation.
ver := ver

It(fmt.Sprintf("[%s] passes prevResult through unchanged", ver), func() {
conf := []byte(fmt.Sprintf(`{
"name": "test",
Expand Down
Loading