ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Simplify unit test

Browse Source 
Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
This commit is contained in:
Tomofumi Hayashi 2024-04-08 15:41:40 +09:00
parent 78ebd8bfb9
commit ccc1cfaa58
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/meta/bandwidth/bandwidth_linux_test.go
View File

@ -117,7 +117,7 @@ var _ = Describe("bandwidth test", func() {
} }
// Container egress (host ingress) // Container egress (host ingress)
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -266,7 +266,7 @@ var _ = Describe("bandwidth test", func() {
} }
// Container egress (host ingress) // Container egress (host ingress)
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -523,7 +523,7 @@ var _ = Describe("bandwidth test", func() {
} }
// Container egress (host ingress) // Container egress (host ingress)
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -779,7 +779,7 @@ var _ = Describe("bandwidth test", func() {
} }
// check container egress side / host ingress side, we expect to get some QoS setup there // check container egress side / host ingress side, we expect to get some QoS setup there
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) })
@ -944,7 +944,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, ifbDeviceName, []byte(conf), func() error { return cmdAdd(args) })
@ -1050,7 +1050,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))
@ -1303,7 +1303,7 @@ var _ = Describe("bandwidth test", func() {
StdinData: []byte(conf), StdinData: []byte(conf),
} }
Expect(hostNs.Do(func(netNS ns.NetNS) error { Expect(hostNs.Do(func(_ ns.NetNS) error {
defer GinkgoRecover() defer GinkgoRecover()
_, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) }) _, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
Expect(err).NotTo(HaveOccurred(), string(out)) Expect(err).NotTo(HaveOccurred(), string(out))