Browse Source

[1239] lo/lo0 interface detection fix in DHCPv4/DHCPv6 server tests.

Tomek Mrugalski 13 years ago
parent
commit
5be5e6a639

+ 6 - 2
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -56,9 +56,13 @@ public:
 class Dhcpv4SrvTest : public ::testing::Test {
 class Dhcpv4SrvTest : public ::testing::Test {
 public:
 public:
     Dhcpv4SrvTest() {
     Dhcpv4SrvTest() {
-        unlink(INTERFACE_FILE);
+       unlink(INTERFACE_FILE);
         fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
         fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
-        fakeifaces << "lo ::1";
+        if (if_nametoindex("lo")>0) {
+            fakeifaces << "lo ::1";
+        } else if (if_nametoindex("lo0")>0) {
+            fakeifaces << "lo0 ::1";
+        }
         fakeifaces.close();
         fakeifaces.close();
     }
     }
 
 

+ 5 - 2
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

@@ -53,9 +53,12 @@ public:
     Dhcpv6SrvTest() {
     Dhcpv6SrvTest() {
         unlink(INTERFACE_FILE);
         unlink(INTERFACE_FILE);
         fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
         fstream fakeifaces(INTERFACE_FILE, ios::out|ios::trunc);
-        fakeifaces << "lo ::1";
+        if (if_nametoindex("lo")>0) {
+            fakeifaces << "lo ::1";
+        } else if (if_nametoindex("lo0")>0) {
+            fakeifaces << "lo0 ::1";
+        }
         fakeifaces.close();
         fakeifaces.close();
-
     }
     }
     ~Dhcpv6SrvTest() {
     ~Dhcpv6SrvTest() {
         unlink(INTERFACE_FILE);
         unlink(INTERFACE_FILE);