From 9d0fd2c121f846ad4fc896aa5635a3ca39c04bbd Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 16 Dec 2014 10:00:47 -0500 Subject: [PATCH] ifcfg-rh/tests: remove gratuituous checks A bunch of tests appear to have copy-and-pasted the same unnecessary check for route6file having been created. Remove them. (cherry picked from commit 1600ed9c6804c097dea96eaeea831224b20d1412) --- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 8d996d5139..0647af5a13 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -6338,9 +6338,6 @@ test_write_wired_static (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "wired-static-write", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -6674,9 +6671,6 @@ test_write_wired_static_ip6_only (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "wired-static-ip6-only-write", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -10440,9 +10434,6 @@ test_write_wired_qeth_dhcp (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "wired-qeth-dhcp-write", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -10571,9 +10562,6 @@ test_write_wired_ctc_dhcp (void) success = nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT); g_assert (success); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -10681,9 +10669,6 @@ test_write_permissions (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "permissions-write", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -10819,9 +10804,6 @@ test_write_wifi_wep_agent_keys (void) success = nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT); g_assert (success); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -11344,9 +11326,6 @@ test_write_bridge_component (void) g_assert (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT)); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -12102,9 +12081,6 @@ test_write_bond_slave (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "bond-slave-write", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile); @@ -12437,9 +12413,6 @@ test_write_bond_slave_ib (void) ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE, "bond-slave-write-ib", "written and re-read connection weren't the same."); - if (route6file) - unlink (route6file); - g_free (testfile); g_free (unmanaged); g_free (keyfile);