From: Ben Pfaff <blp@nicira.com>
Date: Wed, 28 Mar 2012 21:06:54 +0000 (-0700)
Subject: tests: Gracefully shut down ovsdb-server, to avoid valgrind leak warnings.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94c336723ca2228cfd60d2207775871e4b773c8b;p=openvswitch

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>
---

diff --git a/tests/ofproto.at b/tests/ofproto.at
index fdc72155..0f0fd1fd 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 c8de1dec..befa8b76 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 4b17b05c..584ee79b 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 d1c091a3..c57bbc93 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