dispatcher: remove "old" from the test names

There's no reason the dispatcher test files should have "old" in their
names, since they're testing the current dispatcher interface.

diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index f8fd82b..49b2f94 100644 (file)
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -33,7 +33,7 @@ TESTS = test-dispatcher-envp
 endif
 
 EXTRA_DIST= \
-       dispatcher-old-down \
-       dispatcher-old-up \
-       dispatcher-old-vpn-down \
-       dispatcher-old-vpn-up
+       dispatcher-down \
+       dispatcher-up \
+       dispatcher-vpn-down \
+       dispatcher-vpn-up

diff --git a/callouts/tests/dispatcher-old-down b/callouts/tests/dispatcher-down
similarity index 86%
rename from callouts/tests/dispatcher-old-down
rename to callouts/tests/dispatcher-down
index 8098085..da97d3f 100644 (file)
--- a/callouts/tests/dispatcher-old-down
+++ b/callouts/tests/dispatcher-down
@@ -15,7 +15,7 @@ path=/org/freedesktop/NetworkManager/Devices/0
 PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-old-down
+CONNECTION_FILENAME=/callouts/tests/dispatcher-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 

diff --git a/callouts/tests/dispatcher-old-up b/callouts/tests/dispatcher-up
similarity index 96%
rename from callouts/tests/dispatcher-old-up
rename to callouts/tests/dispatcher-up
index e4eb8e6..78cfada 100644 (file)
--- a/callouts/tests/dispatcher-old-up
+++ b/callouts/tests/dispatcher-up
@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
 PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-old-up
+CONNECTION_FILENAME=/callouts/tests/dispatcher-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

diff --git a/callouts/tests/dispatcher-old-vpn-down b/callouts/tests/dispatcher-vpn-down
similarity index 95%
rename from callouts/tests/dispatcher-old-vpn-down
rename to callouts/tests/dispatcher-vpn-down
index e702445..eb4dc2c 100644 (file)
--- a/callouts/tests/dispatcher-old-vpn-down
+++ b/callouts/tests/dispatcher-vpn-down
@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
 PATH=
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-old-vpn-down
+CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

diff --git a/callouts/tests/dispatcher-old-vpn-up b/callouts/tests/dispatcher-vpn-up
similarity index 96%
rename from callouts/tests/dispatcher-old-vpn-up
rename to callouts/tests/dispatcher-vpn-up
index 619c6fe..8ae78a3 100644 (file)
--- a/callouts/tests/dispatcher-old-vpn-up
+++ b/callouts/tests/dispatcher-vpn-up
@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
 PATH=
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-old-vpn-up
+CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index a715b62..abccf61 100644 (file)
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -537,27 +537,27 @@ test_generic (const char *file, const char *override_vpn_ip_iface)
 /*******************************************/
 
 static void
-test_old_up (void)
+test_up (void)
 {
-       test_generic ("dispatcher-old-up", NULL);
+       test_generic ("dispatcher-up", NULL);
 }
 
 static void
-test_old_down (void)
+test_down (void)
 {
-       test_generic ("dispatcher-old-down", NULL);
+       test_generic ("dispatcher-down", NULL);
 }
 
 static void
-test_old_vpn_up (void)
+test_vpn_up (void)
 {
-       test_generic ("dispatcher-old-vpn-up", NULL);
+       test_generic ("dispatcher-vpn-up", NULL);
 }
 
 static void
-test_old_vpn_down (void)
+test_vpn_down (void)
 {
-       test_generic ("dispatcher-old-vpn-down", NULL);
+       test_generic ("dispatcher-vpn-down", NULL);
 }
 
 static void
@@ -566,7 +566,7 @@ test_up_empty_vpn_iface (void)
        /* Test that an empty VPN iface variable, like is passed through D-Bus
         * from NM, is ignored by the dispatcher environment construction code.
         */
-       test_generic ("dispatcher-old-up", "");
+       test_generic ("dispatcher-up", "");
 }
 
 /*******************************************/
@@ -580,10 +580,10 @@ main (int argc, char **argv)
        g_type_init ();
 #endif
 
-       g_test_add_func ("/dispatcher/old_up", test_old_up);
-       g_test_add_func ("/dispatcher/old_down", test_old_down);
-       g_test_add_func ("/dispatcher/old_vpn_up", test_old_vpn_up);
-       g_test_add_func ("/dispatcher/old_vpn_down", test_old_vpn_down);
+       g_test_add_func ("/dispatcher/up", test_up);
+       g_test_add_func ("/dispatcher/down", test_down);
+       g_test_add_func ("/dispatcher/vpn_up", test_vpn_up);
+       g_test_add_func ("/dispatcher/vpn_down", test_vpn_down);
 
        g_test_add_func ("/dispatcher/up_empty_vpn_iface", test_up_empty_vpn_iface);