From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 23 Dec 2011 10:14:52 +0000 (+0100)
Subject: [1237] Fix for failing IfaceMgrTest.{basic|getIface}
X-Git-Tag: trac2351_base~299^2~6^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4e31621d8dbfe3742cc62c8d5435147f7f1b96a;p=thirdparty%2Fkea.git

[1237] Fix for failing IfaceMgrTest.{basic|getIface}
---

diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 06e9df0be8..9abbe1343b 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -56,6 +56,10 @@ public:
         fakeifaces << LOOPBACK << " ::1";
         fakeifaces.close();
     }
+
+    ~IfaceMgrTest() {
+        unlink(INTERFACE_FILE);
+    }
 };
 
 // We need some known interface to work reliably. Loopback interface
@@ -147,6 +151,7 @@ TEST_F(IfaceMgrTest, dhcp6Sniffer) {
 
 TEST_F(IfaceMgrTest, basic) {
     // checks that IfaceManager can be instantiated
+    createLoInterfacesTxt();
 
     IfaceMgr & ifacemgr = IfaceMgr::instance();
     ASSERT_TRUE(&ifacemgr != 0);
@@ -167,6 +172,8 @@ TEST_F(IfaceMgrTest, ifaceClass) {
 // is implemented.
 TEST_F(IfaceMgrTest, getIface) {
 
+    createLoInterfacesTxt();
+
     cout << "Interface checks. Please ignore socket binding errors." << endl;
     NakedIfaceMgr* ifacemgr = new NakedIfaceMgr();
 
@@ -241,7 +248,6 @@ TEST_F(IfaceMgrTest, detectIfaces_stub) {
     EXPECT_STREQ( "fe80::1234", addr.toText().c_str() );
 
     delete ifacemgr;
-    unlink(INTERFACE_FILE);
 }
 #endif
 
@@ -275,7 +281,6 @@ TEST_F(IfaceMgrTest, sockets6) {
     close(socket2);
 
     delete ifacemgr;
-    unlink(INTERFACE_FILE);
 }
 
 // TODO: disabled due to other naming on various systems
@@ -362,7 +367,6 @@ TEST_F(IfaceMgrTest, sendReceive6) {
     EXPECT_TRUE( (rcvPkt->remote_port_ == 10546) || (rcvPkt->remote_port_ == 10547) );
 
     delete ifacemgr;
-    unlink(INTERFACE_FILE);
 }
 
 TEST_F(IfaceMgrTest, socket4) {
@@ -390,7 +394,6 @@ TEST_F(IfaceMgrTest, socket4) {
     close(socket1);
 
     delete ifacemgr;
-    unlink(INTERFACE_FILE);
 }
 
 // Test the Iface structure itself
@@ -520,7 +523,6 @@ TEST_F(IfaceMgrTest, socketInfo) {
     );
 
     delete ifacemgr;
-    unlink(INTERFACE_FILE);
 }
 
 /// @brief parses text representation of MAC address
@@ -775,15 +777,9 @@ TEST_F(IfaceMgrTest, detectIfaces_linux) {
                 cout << "Address " << addr->toText() << " on iterface " << detected->getFullName()
                      << " matched with 'ifconfig -a' output." << endl;
             }
-
         }
-
-
     }
 
-
-
-
     delete ifacemgr;
 }
 #endif