From 24b0bf96afa73cb56c3fc4de9f0d49bc34785b04 Mon Sep 17 00:00:00 2001 From: h0nIg Date: Fri, 11 Oct 2024 10:22:19 +0000 Subject: [PATCH] make test working again Signed-off-by: h0nIg --- integration/integration_linux_test.go | 31 ++++++++++++++----- integration/testdata/basic-ptp.json | 3 +- .../testdata/chained-ptp-bandwidth.conflist | 3 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/integration/integration_linux_test.go b/integration/integration_linux_test.go index 32d4ccce7..0a75c4404 100644 --- a/integration/integration_linux_test.go +++ b/integration/integration_linux_test.go @@ -17,6 +17,7 @@ import ( "bytes" "fmt" "io" + "log" "math/rand" "net" "os" @@ -60,6 +61,13 @@ var _ = Describe("Basic PTP using cnitool", func() { netConfPath, err := filepath.Abs("./testdata") Expect(err).NotTo(HaveOccurred()) + // Flush ipam stores to avoid conflicts + err = os.RemoveAll("/tmp/chained-ptp-bandwidth-test") + Expect(err).NotTo(HaveOccurred()) + + err = os.RemoveAll("/tmp/basic-ptp-test") + Expect(err).NotTo(HaveOccurred()) + env = TestEnv([]string{ "CNI_PATH=" + cniPath, "NETCONFPATH=" + netConfPath, @@ -82,6 +90,7 @@ var _ = Describe("Basic PTP using cnitool", func() { env.runInNS(hostNS, cnitoolBin, "add", netName, contNS.LongName()) addrOutput := env.runInNS(contNS, "ip", "addr") + Expect(addrOutput).To(ContainSubstring(expectedIPPrefix)) env.runInNS(hostNS, cnitoolBin, "del", netName, contNS.LongName()) @@ -145,9 +154,13 @@ var _ = Describe("Basic PTP using cnitool", func() { chainedBridgeBandwidthEnv.runInNS(hostNS, cnitoolBin, "del", "network-chain-test", contNS1.LongName()) basicBridgeEnv.runInNS(hostNS, cnitoolBin, "del", "network-chain-test", contNS2.LongName()) + + contNS1.Del() + contNS2.Del() + hostNS.Del() }) - Measure("limits traffic only on the restricted bandwidth veth device", func(b Benchmarker) { + It("limits traffic only on the restricted bandwidth veth device", func() { ipRegexp := regexp.MustCompile(`10\.1[12]\.2\.\d{1,3}`) By(fmt.Sprintf("adding %s to %s\n\n", "chained-bridge-bandwidth", contNS1.ShortName())) @@ -172,17 +185,19 @@ var _ = Describe("Basic PTP using cnitool", func() { // balanced by run time. By(fmt.Sprintf("sending tcp traffic to the chained, bridged, traffic shaped container on ip address '%s:%d'\n\n", chainedBridgeIP, chainedBridgeBandwidthPort)) - runtimeWithLimit := b.Time("with chained bridge and bandwidth plugins", func() { - makeTCPClientInNS(hostNS.ShortName(), chainedBridgeIP, chainedBridgeBandwidthPort, packetInBytes) - }) + start := time.Now() + makeTCPClientInNS(hostNS.ShortName(), chainedBridgeIP, chainedBridgeBandwidthPort, packetInBytes) + runtimeWithLimit := time.Since(start) + log.Printf("Runtime with qos limit %.2f seconds", runtimeWithLimit.Seconds()) By(fmt.Sprintf("sending tcp traffic to the basic bridged container on ip address '%s:%d'\n\n", basicBridgeIP, basicBridgePort)) - runtimeWithoutLimit := b.Time("with basic bridged plugin", func() { - makeTCPClientInNS(hostNS.ShortName(), basicBridgeIP, basicBridgePort, packetInBytes) - }) + start = time.Now() + makeTCPClientInNS(hostNS.ShortName(), basicBridgeIP, basicBridgePort, packetInBytes) + runtimeWithoutLimit := time.Since(start) + log.Printf("Runtime without qos limit %.2f seconds", runtimeWithoutLimit.Seconds()) Expect(runtimeWithLimit).To(BeNumerically(">", runtimeWithoutLimit+1000*time.Millisecond)) - }, 1) + }) }) }) diff --git a/integration/testdata/basic-ptp.json b/integration/testdata/basic-ptp.json index 11dc3aa61..dc04c5301 100644 --- a/integration/testdata/basic-ptp.json +++ b/integration/testdata/basic-ptp.json @@ -6,6 +6,7 @@ "mtu": 512, "ipam": { "type": "host-local", - "subnet": "10.1.2.0/24" + "subnet": "10.1.2.0/24", + "dataDir": "/tmp/basic-ptp-test" } } diff --git a/integration/testdata/chained-ptp-bandwidth.conflist b/integration/testdata/chained-ptp-bandwidth.conflist index 2510ba882..b7b3d60a7 100644 --- a/integration/testdata/chained-ptp-bandwidth.conflist +++ b/integration/testdata/chained-ptp-bandwidth.conflist @@ -8,7 +8,8 @@ "mtu": 512, "ipam": { "type": "host-local", - "subnet": "10.9.2.0/24" + "subnet": "10.9.2.0/24", + "dataDir": "/tmp/chained-ptp-bandwidth-test" } }, {