Skip to content

Commit 33cc6bd

Browse files
yushoyamaguchisqueed
authored andcommitted
bridge: fix IPv6 address order assumption in test
Linux kernel v7.0 changed same-scope IPv6 address insertion from prepend to append (torvalds/linux@cb3de96eea66), causing AddrList to return addresses in insertion order rather than reverse order. Replace index-based checks in checkBridgeIPs with ContainElement to make the test order-independent. Signed-off-by: Yusho Yamaguchi <ys-yamaguchi@kddi.com>
1 parent d653d38 commit 33cc6bd

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

plugins/main/bridge/bridge_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,11 +2255,13 @@ var _ = Describe("bridge Operations", func() {
22552255
addrs, err := netlinksafe.AddrList(bridge, family)
22562256
Expect(err).NotTo(HaveOccurred())
22572257
Expect(addrs).To(HaveLen(expNumAddrs))
2258-
addr := addrs[0].IPNet.String()
2259-
Expect(addr).To(Equal(cidr0))
2258+
addrStrs := make([]string, len(addrs))
2259+
for i, a := range addrs {
2260+
addrStrs[i] = a.IPNet.String()
2261+
}
2262+
Expect(addrStrs).To(ContainElement(cidr0))
22602263
if cidr1 != "" {
2261-
addr = addrs[1].IPNet.String()
2262-
Expect(addr).To(Equal(cidr1))
2264+
Expect(addrStrs).To(ContainElement(cidr1))
22632265
}
22642266
}
22652267

0 commit comments

Comments
 (0)