From a4a554a51b60f464bc3771a12bc4e19b1bacec7e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 9 Aug 2010 13:47:52 -0500 Subject: [PATCH] Revert "ifcfg-rh: testcases for unmanaged BRIDGE and VLAN" This reverts commit 007e134594fc3129d001f370dd40d8d8356690fc. --- .../network-scripts/ifcfg-test-vlan-interface | 1 - .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 18 ++++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface index 6af42768bc..6c841855ed 100644 --- a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface +++ b/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface @@ -1,5 +1,4 @@ DEVICE=eth1.43 -HWADDR=00:22:15:59:62:97 VLAN=yes ONBOOT=yes BOOTPROTO=none diff --git a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index e4a42f77bf..e19acb1311 100644 --- a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -9332,12 +9332,8 @@ test_read_bridge_component (void) &route6file, &error, &ignore_error); - ASSERT (connection != NULL, - "bridge-component-read", "unexpected failure reading %s", TEST_IFCFG_BRIDGE_COMPONENT); - ASSERT (unmanaged != NULL, - "bridge-component-read", "unexpected managed device reading %s", TEST_IFCFG_BRIDGE_COMPONENT); - ASSERT (strcmp (unmanaged, "mac:00:22:15:59:62:97") == 0, - "bridge-component-read", "expected unmanaged device reading %s", TEST_IFCFG_BRIDGE_COMPONENT); + ASSERT (connection == NULL, + "bridge-component-read", "unexpected success reading %s", TEST_IFCFG_BRIDGE_COMPONENT); } #define TEST_IFCFG_VLAN_INTERFACE TEST_IFCFG_DIR"/network-scripts/ifcfg-test-vlan-interface" @@ -9363,14 +9359,8 @@ test_read_vlan_interface (void) &route6file, &error, &ignore_error); - ASSERT (connection != NULL, - "vlan-interface-read", "unexpected failure reading %s", TEST_IFCFG_VLAN_INTERFACE); - ASSERT (unmanaged != NULL, - "vlan-interface-read", "unexpected managed device reading %s", TEST_IFCFG_VLAN_INTERFACE); - ASSERT (strcmp (unmanaged, "mac:00:22:15:59:62:97") == 0, - "vlan-interface-read", "expected unmanaged device reading %s", TEST_IFCFG_VLAN_INTERFACE); - - g_object_unref (connection); + ASSERT (connection == NULL, + "vlan-interface-read", "unexpected success reading %s", TEST_IFCFG_VLAN_INTERFACE); } #define TEST_IFCFG_WIFI_OPEN_SSID_BAD_HEX TEST_IFCFG_DIR"/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex"