Skip to content

Commit 2cd249f

Browse files
committed
fix a compilation issue
1 parent e38b69e commit 2cd249f

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

test/integration/utils_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ func tcFilterCheckBw(expBw, expBurst int64) error {
323323
return err
324324
}
325325
output := strings.Split(str, "rate ")
326+
if len(output) < 2 {
327+
log.Errorf("Got `tc -s filter show dev` output:\n%s", output)
328+
return fmt.Errorf("Unexpected `tc -s filter show dev` output")
329+
}
326330
rate := strings.Split(output[1], "burst")
327331
regex := regexp.MustCompile("[0-9]+")
328332
outputStr := regex.FindAllString(rate[0], -1)

test/systemtests/service_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (s *systemtestSuite) testServiceAddDeleteService(c *C, encap string) {
106106
}
107107
if s.fwdMode == "routing" && encap == "vlan" {
108108
for _, cList := range containers {
109-
_, err := s.CheckBgpRouteDistribution(c, cList)
109+
err := s.CheckBgpRouteDistribution(c, cList)
110110
c.Assert(err, IsNil)
111111
}
112112
}
@@ -274,7 +274,7 @@ func (s *systemtestSuite) testServiceAddDeleteProviders(c *C, encap string) {
274274

275275
if s.fwdMode == "routing" && encap == "vlan" {
276276
for _, cList := range containers {
277-
_, err := s.CheckBgpRouteDistribution(c, cList)
277+
err := s.CheckBgpRouteDistribution(c, cList)
278278
c.Assert(err, IsNil)
279279
}
280280
}
@@ -473,7 +473,7 @@ func (s *systemtestSuite) testServiceSequenceProviderAddServiceAdd(c *C, encap s
473473
}
474474
if s.fwdMode == "routing" && encap == "vlan" {
475475
for _, cList := range containers {
476-
_, err := s.CheckBgpRouteDistribution(c, cList)
476+
err := s.CheckBgpRouteDistribution(c, cList)
477477
c.Assert(err, IsNil)
478478
}
479479
}
@@ -645,7 +645,7 @@ func (s systemtestSuite) testServiceTriggerNetmasterSwitchover(c *C, encap strin
645645
}
646646
if s.fwdMode == "routing" && encap == "vlan" {
647647
for _, cList := range containers {
648-
_, err := s.CheckBgpRouteDistribution(c, cList)
648+
err := s.CheckBgpRouteDistribution(c, cList)
649649
c.Assert(err, IsNil)
650650
}
651651
}
@@ -860,7 +860,7 @@ func (s systemtestSuite) testServiceTriggerNetpluginRestart(c *C, encap string)
860860
}
861861
if s.fwdMode == "routing" && encap == "vlan" {
862862
for _, cList := range containers {
863-
_, err := s.CheckBgpRouteDistribution(c, cList)
863+
err := s.CheckBgpRouteDistribution(c, cList)
864864
c.Assert(err, IsNil)
865865
}
866866
}
@@ -907,7 +907,7 @@ func (s systemtestSuite) testServiceTriggerNetpluginRestart(c *C, encap string)
907907
if s.fwdMode == "routing" && encap == "vlan" {
908908
s.CheckBgpConnection(c)
909909
for _, cList := range containers {
910-
_, err := s.CheckBgpRouteDistribution(c, cList)
910+
err := s.CheckBgpRouteDistribution(c, cList)
911911
c.Assert(err, IsNil)
912912
}
913913
} else {
@@ -1019,7 +1019,7 @@ func (s *systemtestSuite) addProviders(c *C, labels []string, numProviders int,
10191019
containers, err = s.runContainers(numProviders, false, netName, tenant, names, labels)
10201020
c.Assert(err, IsNil)
10211021
if s.fwdMode == "routing" && encap == "vlan" {
1022-
_, err = s.CheckBgpRouteDistribution(c, containers)
1022+
err = s.CheckBgpRouteDistribution(c, containers)
10231023
c.Assert(err, IsNil)
10241024
}
10251025
return containers

0 commit comments

Comments
 (0)