diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-03-28 14:06:54 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-03-28 14:55:26 -0700 |
| commit | 94c336723ca2228cfd60d2207775871e4b773c8b (patch) | |
| tree | ec3697c0dc694baf79da5ecb25d461ef53ed1d2e /tests | |
| parent | 75b87ae5aefa26470e2dd2cac807ba895248534d (diff) | |
| download | openvswitch-94c336723ca2228cfd60d2207775871e4b773c8b.tar.gz | |
tests: Gracefully shut down ovsdb-server, to avoid valgrind leak warnings.
When ovsdb-server exits gracefully it frees all the memory that it owns,
which keeps valgrind from warning about "possibly lost" blocks.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ofproto.at | 1 | ||||
| -rw-r--r-- | tests/ovs-monitor-ipsec.at | 2 | ||||
| -rw-r--r-- | tests/ovs-vsctl.at | 1 | ||||
| -rw-r--r-- | tests/ovs-xapi-sync.at | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/tests/ofproto.at b/tests/ofproto.at index fdc72155d..0f0fd1fd8 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -527,4 +527,5 @@ ovs-appctl -t ovs-ofctl ofctl/send 0104001400000002000023200000000a00000001 check_async 7 OFPR_ACTION OFPPR_ADD ovs-appctl -t ovs-ofctl exit +OVS_VSWITCHD_STOP AT_CLEANUP diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at index c8de1decd..befa8b76f 100644 --- a/tests/ovs-monitor-ipsec.at +++ b/tests/ovs-monitor-ipsec.at @@ -309,4 +309,6 @@ sainfo anonymous { ]) AT_CHECK([test ! -f etc/racoon/certs/ovs-3.4.5.6.pem]) +OVSDB_SERVER_SHUTDOWN + AT_CLEANUP diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 4b17b05c6..584ee79b9 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -871,6 +871,7 @@ VSCTL_CHECK_FIND([other-config:x{>}x], []) VSCTL_CHECK_FIND([other-config:x{>}""], []) VSCTL_CHECK_FIND([other-config:x{>}y], []) VSCTL_CHECK_FIND([other-config:x{>}z], []) +OVS_VSCTL_CLEANUP AT_CLEANUP AT_SETUP([database commands -- wait-until immediately true]) diff --git a/tests/ovs-xapi-sync.at b/tests/ovs-xapi-sync.at index d1c091a35..c57bbc93c 100644 --- a/tests/ovs-xapi-sync.at +++ b/tests/ovs-xapi-sync.at @@ -72,4 +72,6 @@ AT_CHECK([ovs_vsctl get interface vif1.0 external-ids], [0], [{attached-mac="00:11:22:33:44:55", iface-id="custom iface ID", iface-status=active, vm-id="custom vm ID", xs-network-uuid="9b66c68b-a74e-4d34-89a5-20a8ab352d1e", xs-vif-uuid="6ab1b260-398e-49ba-827b-c7696108964c", xs-vm-uuid="fcb8a3f6-dc04-41d2-8b8a-55afd2b755b8"} ]) +OVSDB_SERVER_SHUTDOWN + AT_CLEANUP |