From 9f33d4428c6fe1ab5670f3116c53eb00646f0f9a Mon Sep 17 00:00:00 2001
From: Andy Zhou <azhou@nicira.com>
Date: Fri, 6 Feb 2015 16:15:06 -0800
Subject: [PATCH] test: Hide the name space clean up inside ADD_NAMESPACE macro

To reduce the complexity of writing kmod tests.

Suggested-by: Joe Stringer <joestringer@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.comugi
---
 tests/kmod-macros.at  | 1 +
 tests/kmod-traffic.at | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kmod-macros.at b/tests/kmod-macros.at
index 1281e25d1..582494019 100644
--- a/tests/kmod-macros.at
+++ b/tests/kmod-macros.at
@@ -53,6 +53,7 @@ m4_define([ADD_NAMESPACES],
    [m4_foreach([ns], [$@],
                [DEL_NAMESPACES(ns)
                 AT_CHECK([ip netns add ns])
+                ON_EXIT(DEL_NAMESPACES(ns))
                ])
    ]
 )
diff --git a/tests/kmod-traffic.at b/tests/kmod-traffic.at
index bcc4c1701..f7783be85 100644
--- a/tests/kmod-traffic.at
+++ b/tests/kmod-traffic.at
@@ -5,7 +5,6 @@ OVS_KMOD_VSWITCHD_START(
    [set-fail-mode br0 standalone -- ])
 
 ADD_NAMESPACES(at_ns0, at_ns1)
-ON_EXIT(DEL_NAMESPACES(at_ns0, at_ns1))
 
 ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
 ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
-- 
2.20.1