Fix topo_br acceptance tests (#2969)

scionproto · Aug 7, 2019 · a1bbbb1 · a1bbbb1
1 parent 434510d
commit a1bbbb1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/acceptance/topo_br_reload_if_ip_acceptance/test b/acceptance/topo_br_reload_if_ip_acceptance/test
@@ -92,7 +92,7 @@ change_remote_ip() {
     jq ".BorderRouters[].Interfaces[].RemoteOverlay.Addr = $3" $1 | sponge $1
     ./tools/dc scion kill -s HUP scion_br"$2"-1
     sleep 2
-    check_logs "RemoteAddr:[$(unqoute $3)]" $2
+    check_logs "Remote:[$(unqoute $3)]" $2
 }
 
 check_change_initial_ip() {

diff --git a/acceptance/topo_br_reload_if_port_acceptance/test b/acceptance/topo_br_reload_if_port_acceptance/test
@@ -51,7 +51,7 @@ check_change_remote_port() {
     jq '.BorderRouters[].Interfaces[].RemoteOverlay.OverlayPort = 42424' $DST_TOPO | sponge $DST_TOPO
     ./tools/dc scion kill -s HUP scion_br"$DST_IA_FILE"-1
     sleep 2
-    check_logs "RemoteAddr:[$addr_src]:42424" $DST_IA_FILE
+    check_logs "Remote:[$addr_src]:42424" $DST_IA_FILE
     check_connectivity "End check_change_remote_port"
 }
 

diff --git a/go/lib/topology/topology.go b/go/lib/topology/topology.go
@@ -463,6 +463,6 @@ func (i IFInfo) Verify(isCore bool, brName string) error {
 
 func (i IFInfo) String() string {
 	return fmt.Sprintf("IFinfo: Name[%s] IntAddr[%+v] CtrlAddr[%+v] Overlay:%s Local:%+v "+
-		"Remote:+%v Bw:%d IA:%s Type:%s MTU:%d", i.BRName, i.InternalAddrs, i.CtrlAddrs, i.Overlay,
+		"Remote:%+v Bw:%d IA:%s Type:%s MTU:%d", i.BRName, i.InternalAddrs, i.CtrlAddrs, i.Overlay,
 		i.Local, i.Remote, i.Bandwidth, i.ISD_AS, i.LinkType, i.MTU)
 }