From 7ed22185dd3f4065aae25d733f0feeb1c97f1333 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 9 Aug 2010 13:41:37 -0500 Subject: [PATCH] ifcfg-rh: bridge components are now expected to provide a valid connection They aren't ignored if they have HWADDR due to commit 46696c22ca32999ec09d1ac395e8f043522fdf2d (ifcfg-rh: correct handling of BRIDGE and VLAN unmanaged connections (rh #619863)) --- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 e19acb1311..ea96ec5cc1 100644 --- a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -9332,8 +9332,17 @@ test_read_bridge_component (void) &route6file, &error, &ignore_error); - ASSERT (connection == NULL, - "bridge-component-read", "unexpected success reading %s", TEST_IFCFG_BRIDGE_COMPONENT); + ASSERT (connection != NULL, + "bridge-component-read", "unexpected failure reading %s", TEST_IFCFG_BRIDGE_COMPONENT); + + ASSERT (unmanaged != NULL, + "bridge-component-read", "missing unmanaged spec from %s", TEST_IFCFG_BRIDGE_COMPONENT); + + ASSERT (g_strcmp0 (unmanaged, "mac:00:22:15:59:62:97") == 0, + "bridge-component-read", "unexpected unmanaged spec from %s", TEST_IFCFG_BRIDGE_COMPONENT); + + g_object_unref (connection); + g_free (unmanaged); } #define TEST_IFCFG_VLAN_INTERFACE TEST_IFCFG_DIR"/network-scripts/ifcfg-test-vlan-interface"