Skip to content

Commit 42f95c8

Browse files
committed
Fix some wording in output
Delete unused variables
1 parent 45ab231 commit 42f95c8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

plugins/ipam/plugin_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var _ = Describe("IPAM Plugin", func() {
8888
Expect(handler).NotTo(BeNil())
8989
})
9090

91-
It("should not return an error for empty ipam config", func() {
91+
It("should not return an error for empty IPAM config", func() {
9292
invalidConfig := &api.IPAMConfig{}
9393
invalidConfigData, err := yaml.Marshal(invalidConfig)
9494
Expect(err).NotTo(HaveOccurred())
@@ -152,7 +152,7 @@ var _ = Describe("IPAM Plugin", func() {
152152
Expect(checkIP).To(BeFalse())
153153
})
154154

155-
It("return formrted string, if valid ipv6", func() {
155+
It("return formatted string, if valid ipv6", func() {
156156
longIP := getLongIPv6(net.ParseIP("fe80::"))
157157
Expect(longIP).To(Equal("fe80-0000-0000-0000-0000-0000-0000-0000"))
158158
})
@@ -163,7 +163,7 @@ var _ = Describe("IPAM Plugin", func() {
163163
}).To(Panic())
164164
})
165165

166-
It("return pretty fromated string for ipamv1alpha1.IPSpec", func() {
166+
It("return pretty formatted string for ipamv1alpha1.IPSpec", func() {
167167
ipv6Addr, err := ipamv1alpha1.IPAddrFromString(linkLocalIPV6Addr.String())
168168
Expect(err).NotTo(HaveOccurred())
169169
ipv6 := &ipamv1alpha1.IP{

plugins/ipam/suite_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ const (
3434
pollingInterval = 50 * time.Millisecond
3535
eventuallyTimeout = 3 * time.Second
3636
consistentlyDuration = 1 * time.Second
37-
unknownMachineMACAddress = "11:11:11:11:11:11"
3837
linkLocalIPV6Prefix = "fe80::"
39-
subnetLabel = "subnet=dhcp"
4038
machineWithIPAddressMACAddress = "11:22:33:44:55:66"
41-
machineWithWrongMACAddress = "11:22:33:44"
4239
machineWithMacAddress = "11:22:33:44:55:77"
43-
privateIPV4Address = "192.168.47.11"
4440
ipamConfigFile = "config.yaml"
4541
)
4642

@@ -75,7 +71,7 @@ var _ = BeforeSuite(func() {
7571
// Note that you must have the required binaries setup under the bin directory to perform
7672
// the tests directly. When we run make test it will be setup and used automatically.
7773
BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
78-
fmt.Sprintf("1.30.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
74+
fmt.Sprintf("1.32.0-%s-%s", runtime.GOOS, runtime.GOARCH)),
7975
}
8076

8177
var err error
@@ -134,6 +130,7 @@ func SetupTest() *corev1.Namespace {
134130
Expect(err).NotTo(HaveOccurred())
135131
Expect(config.Namespace).To(Equal(ns.Name))
136132
Expect(config.Subnets[0]).To(Equal("ipam-subnet1"))
133+
Expect(config.Subnets[1]).To(Equal("ipam-subnet2"))
137134
})
138135

139136
return ns

plugins/metal/plugin_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ var _ = Describe("Endpoint", func() {
453453
Eventually(Get(endpoint)).Should(Satisfy(apierrors.IsNotFound))
454454
})
455455

456-
It("Should not create an endpoint for IPv6 DHCP request from a unknown machine", func(ctx SpecContext) {
456+
FIt("Should not create an endpoint for IPv6 DHCP request from a unknown machine", func(ctx SpecContext) {
457457
mac, _ := net.ParseMAC(unknownMachineMACAddress)
458458

459459
req, _ := dhcpv4.NewDiscovery(mac)

0 commit comments

Comments
 (0)