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.
This commit is contained in:
Dan Winship
2014-12-18 08:35:58 -05:00
parent 1bc942b142
commit 9cfd9d376f
6 changed files with 21 additions and 21 deletions

View File

@@ -33,7 +33,7 @@ TESTS = test-dispatcher-envp
endif endif
EXTRA_DIST= \ EXTRA_DIST= \
dispatcher-old-down \ dispatcher-down \
dispatcher-old-up \ dispatcher-up \
dispatcher-old-vpn-down \ dispatcher-vpn-down \
dispatcher-old-vpn-up dispatcher-vpn-up

View File

@@ -15,7 +15,7 @@ path=/org/freedesktop/NetworkManager/Devices/0
PATH= PATH=
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_ID=Random Connection CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/callouts/tests/dispatcher-old-down CONNECTION_FILENAME=/callouts/tests/dispatcher-down
DEVICE_IFACE=wlan0 DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=wlan0 DEVICE_IP_IFACE=wlan0

View File

@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
PATH= PATH=
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_ID=Random Connection CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/callouts/tests/dispatcher-old-up CONNECTION_FILENAME=/callouts/tests/dispatcher-up
DEVICE_IFACE=wlan0 DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=wlan0 DEVICE_IP_IFACE=wlan0
IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

View File

@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
PATH= PATH=
CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
CONNECTION_ID=Random Connection CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/callouts/tests/dispatcher-old-vpn-down CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-down
DEVICE_IFACE=wlan0 DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=tun0 DEVICE_IP_IFACE=tun0
IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

View File

@@ -34,7 +34,7 @@ domains=hsd1.mn.comcast.net.
PATH= PATH=
CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
CONNECTION_ID=Random Connection CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/callouts/tests/dispatcher-old-vpn-up CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-up
DEVICE_IFACE=wlan0 DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=tun0 DEVICE_IP_IFACE=tun0
IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1 IP4_ADDRESS_0=192.168.1.119/24 192.168.1.1

View File

@@ -537,27 +537,27 @@ test_generic (const char *file, const char *override_vpn_ip_iface)
/*******************************************/ /*******************************************/
static void static void
test_old_up (void) test_up (void)
{ {
test_generic ("dispatcher-old-up", NULL); test_generic ("dispatcher-up", NULL);
} }
static void static void
test_old_down (void) test_down (void)
{ {
test_generic ("dispatcher-old-down", NULL); test_generic ("dispatcher-down", NULL);
} }
static void 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 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 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 /* Test that an empty VPN iface variable, like is passed through D-Bus
* from NM, is ignored by the dispatcher environment construction code. * 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 (); g_type_init ();
#endif #endif
g_test_add_func ("/dispatcher/old_up", test_old_up); g_test_add_func ("/dispatcher/up", test_up);
g_test_add_func ("/dispatcher/old_down", test_old_down); g_test_add_func ("/dispatcher/down", test_down);
g_test_add_func ("/dispatcher/old_vpn_up", test_old_vpn_up); g_test_add_func ("/dispatcher/vpn_up", test_vpn_up);
g_test_add_func ("/dispatcher/old_vpn_down", test_old_vpn_down); g_test_add_func ("/dispatcher/vpn_down", test_vpn_down);
g_test_add_func ("/dispatcher/up_empty_vpn_iface", test_up_empty_vpn_iface); g_test_add_func ("/dispatcher/up_empty_vpn_iface", test_up_empty_vpn_iface);