Skip to content

Commit

Permalink
tests: Avoid nonportable "sed -i".
Browse files Browse the repository at this point in the history
"sed -i" isn't entirely portable, and we can avoid it by using the
argument to check_logs as intended.

Signed-off-by: Ben Pfaff <[email protected]>
Acked-by: Alex Wang <[email protected]>
  • Loading branch information
blp committed Aug 28, 2015
1 parent 32e35d7 commit d3292dd
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions tests/ovn-controller-vtep.at
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ m4_define([OVN_CONTROLLER_VTEP_STOP],
# sending update back to *ctl command if *ctl has not proceeded to exit yet.
# and if *ctl command exits before database calling send, the send from
# database will fail with 'Broken pipe' error.
AT_CHECK([sed -i '/Broken pipe/d' ovsdb-server.log])
AT_CHECK([check_logs $1])
AT_CHECK([check_logs "$1
/Broken pipe/d"])
AT_CHECK([ovs-appctl -t ovs-vtep exit])
AT_CHECK([ovs-appctl -t ovn-northd exit])
AT_CHECK([ovs-appctl -t ovn-controller-vtep exit])
Expand Down Expand Up @@ -131,10 +131,6 @@ OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-vtep.log`"])
AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-vtep.log], [0], [dnl
|WARN|Chassis for VTEP physical switch (br-vtep) disappears, maybe deleted by ovn-sbctl, adding it back
])
# this removal of chassis could cause 'Broken pipe' warning in the ovsdb-server.log,
# due to the race between 'ovn-sbctl' exiting and 'ovn-controller-vtep' adding
# the chassis back. so just removes the 'Broken pipe' warning from ovsdb-server.log.
AT_CHECK([sed -i '/Broken pipe/d' ovsdb-server.log])

# changes the tunnel_ip on physical switch, watches the update of chassis's
# encap.
Expand Down Expand Up @@ -179,7 +175,7 @@ AT_CHECK([ovn-sbctl --columns=vtep_logical_switches list Chassis | cut -d ':' -f
[[]]
])

OVN_CONTROLLER_VTEP_STOP(["/Chassis for VTEP physical switch (br-vtep) disappears/d"])
OVN_CONTROLLER_VTEP_STOP([/Chassis for VTEP physical switch (br-vtep) disappears/d])
AT_CLEANUP


Expand Down Expand Up @@ -242,7 +238,7 @@ AT_CHECK_UNQUOTED([ovn-sbctl --columns=chassis list Port_Binding | cut -d ':' -f
[[]]
])

OVN_CONTROLLER_VTEP_STOP(["/has already been associated with logical port/d"])
OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical port/d])
AT_CLEANUP


Expand Down Expand Up @@ -282,5 +278,5 @@ AT_CHECK_UNQUOTED([ovn-sbctl --columns=chassis list Port_Binding br-vtep_lswitch
${chassis_uuid}
])

OVN_CONTROLLER_VTEP_STOP(["/has already been associated with logical datapath/d"])
OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical datapath/d])
AT_CLEANUP

0 comments on commit d3292dd

Please sign in to comment.