commit d1827b8f83387754f2c4de8250d86d4442bab285
author Luke Huang <huangluke@google.com> Fri Feb 15 15:03:27 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Feb 15 08:56:24 2019 +0000
tree bce28372b4d988c474fb2cb4e93a2da20962de6d
parent df34972b6b4c01046c4d480f7d2e07ec149a2144

Fix broken test TestIpfwdAddRemoveInterfaceForward in Cuttlefish

Bug: 124361845
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass

Change-Id: I287b33f86be5bb0921c0002a07c0f52554fff1ca

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 6acdb3f..55b1bf2 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -1380,16 +1380,22 @@
 }
 
 TEST_F(BinderTest, TestIpfwdAddRemoveInterfaceForward) {
-    static const char testFromIf[] = "dummy0";
-    static const char testToIf[] = "dummy0";
+  // Add test physical network
+  EXPECT_TRUE(
+      mNetd->networkCreatePhysical(TEST_NETID1, INetd::PERMISSION_NONE).isOk());
+  EXPECT_TRUE(mNetd->networkAddInterface(TEST_NETID1, sTun.name()).isOk());
+  EXPECT_TRUE(
+      mNetd->networkCreatePhysical(TEST_NETID2, INetd::PERMISSION_NONE).isOk());
+  EXPECT_TRUE(mNetd->networkAddInterface(TEST_NETID2, sTun2.name()).isOk());
 
-    binder::Status status = mNetd->ipfwdAddInterfaceForward(testFromIf, testToIf);
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    expectIpfwdRuleExists(testFromIf, testToIf);
+  binder::Status status =
+      mNetd->ipfwdAddInterfaceForward(sTun.name(), sTun2.name());
+  EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+  expectIpfwdRuleExists(sTun.name().c_str(), sTun2.name().c_str());
 
-    status = mNetd->ipfwdRemoveInterfaceForward(testFromIf, testToIf);
-    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
-    expectIpfwdRuleNotExists(testFromIf, testToIf);
+  status = mNetd->ipfwdRemoveInterfaceForward(sTun.name(), sTun2.name());
+  EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+  expectIpfwdRuleNotExists(sTun.name().c_str(), sTun2.name().c_str());
 }
 
 namespace {