projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Fix sensitivity to record ordering in test-netflow output.
[openvswitch]
/
tests
/
ofproto.at
diff --git
a/tests/ofproto.at
b/tests/ofproto.at
index e3239f9830ae4bc91ffaacccb2322e786b22896b..a0558510557dbf1cdef92418369121a50bd02b02 100644
(file)
--- a/
tests/ofproto.at
+++ b/
tests/ofproto.at
@@
-60,12
+60,12
@@
AT_CHECK([STRIP_XIDS stdout], [0], [dnl
OFPST_QUEUE reply: 0 queues
])
AT_CHECK([ovs-ofctl -vwarn queue-stats br0 ALL 5], [0],
OFPST_QUEUE reply: 0 queues
])
AT_CHECK([ovs-ofctl -vwarn queue-stats br0 ALL 5], [0],
- [OFPT_ERROR (xid=0x
1
): OFPQOFC_BAD_QUEUE
-OFPST_QUEUE request (xid=0x
1
):port=ALL queue=5
+ [OFPT_ERROR (xid=0x
2
): OFPQOFC_BAD_QUEUE
+OFPST_QUEUE request (xid=0x
2
):port=ALL queue=5
])
AT_CHECK([ovs-ofctl -vwarn queue-stats br0 10], [0],
])
AT_CHECK([ovs-ofctl -vwarn queue-stats br0 10], [0],
- [OFPT_ERROR (xid=0x
1
): OFPQOFC_BAD_PORT
-OFPST_QUEUE request (xid=0x
1
):port=10 queue=ALL
+ [OFPT_ERROR (xid=0x
2
): OFPQOFC_BAD_PORT
+OFPST_QUEUE request (xid=0x
2
):port=10 queue=ALL
])
OVS_VSWITCHD_STOP
AT_CLEANUP
])
OVS_VSWITCHD_STOP
AT_CLEANUP
@@
-354,7
+354,7
@@
AT_CLEANUP
AT_SETUP([ofproto - flow table configuration])
OVS_VSWITCHD_START
# Check the default configuration.
AT_SETUP([ofproto - flow table configuration])
OVS_VSWITCHD_START
# Check the default configuration.
-(echo "OFPST_TABLE reply (xid=0x
1
): 255 tables
+(echo "OFPST_TABLE reply (xid=0x
2
): 255 tables
0: classifier: wild=0x3fffff, max=1000000, active=0
lookup=0, matched=0"
x=1
0: classifier: wild=0x3fffff, max=1000000, active=0
lookup=0, matched=0"
x=1
@@
-379,7
+379,7
@@
AT_CHECK(
])
# Check that the configuration was updated.
mv expout orig-expout
])
# Check that the configuration was updated.
mv expout orig-expout
-(echo "OFPST_TABLE reply (xid=0x
1
): 255 tables
+(echo "OFPST_TABLE reply (xid=0x
2
): 255 tables
0: main : wild=0x3fffff, max=1000000, active=0
lookup=0, matched=0
1: table1 : wild=0x3fffff, max= 1024, active=0
0: main : wild=0x3fffff, max=1000000, active=0
lookup=0, matched=0
1: table1 : wild=0x3fffff, max= 1024, active=0
@@
-910,7
+910,7
@@
echo n_msgs=$n_msgs
OVS_VSWITCHD_START
# Start a monitor watching the flow table, then make it block.
OVS_VSWITCHD_START
# Start a monitor watching the flow table, then make it block.
-trap 'kill `cat ovsdb-server.pid ovs-vswitchd.pid ovs-ofctl.pid`' 0
+ON_EXIT([kill `cat ovs-ofctl.pid`])
ovs-ofctl monitor br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
AT_CAPTURE_FILE([monitor.log])
ovs-appctl -t ovs-ofctl ofctl/block
ovs-ofctl monitor br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
AT_CAPTURE_FILE([monitor.log])
ovs-appctl -t ovs-ofctl ofctl/block