diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-03 18:47:37 +0000 |
|---|---|---|
| committer | Maciej Zenczykowski <maze@google.com> | 2020-06-04 10:46:46 +0000 |
| commit | d86d652ae806126a11372423dafd636ea5e669e2 (patch) | |
| tree | fbc53d8ecdc0cc511868228c0f93c31dd0cdf843 | |
| parent | 99f8d2166bf832395d84842a1ad3556e28af3516 (diff) | |
| download | netd-d86d652ae806126a11372423dafd636ea5e669e2.tar.gz | |
Fix formatting in TestIpfwdAddRemoveInterfaceForward.
This keeps clang-format happy.
Test: atest netd_integration_test
Bug: 158164961
Original-Change: https://android-review.googlesource.com/1323472
Merged-In: I4b2e1532dbbf436fd0721746e5aa0ccda00aae11
Change-Id: I4b2e1532dbbf436fd0721746e5aa0ccda00aae11
| -rw-r--r-- | tests/binder_test.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp index 7018e822..0b62ff0c 100644 --- a/tests/binder_test.cpp +++ b/tests/binder_test.cpp @@ -1416,22 +1416,19 @@ TEST_F(NetdBinderTest, TestIpfwdEnableDisableStatusForwarding) { } TEST_F(NetdBinderTest, TestIpfwdAddRemoveInterfaceForward) { - // 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(sTun.name(), sTun2.name()); - EXPECT_TRUE(status.isOk()) << status.exceptionMessage(); - expectIpfwdRuleExists(sTun.name().c_str(), sTun2.name().c_str()); - - status = mNetd->ipfwdRemoveInterfaceForward(sTun.name(), sTun2.name()); - EXPECT_TRUE(status.isOk()) << status.exceptionMessage(); - expectIpfwdRuleNotExists(sTun.name().c_str(), sTun2.name().c_str()); + // 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(sTun.name(), sTun2.name()); + EXPECT_TRUE(status.isOk()) << status.exceptionMessage(); + expectIpfwdRuleExists(sTun.name().c_str(), sTun2.name().c_str()); + + status = mNetd->ipfwdRemoveInterfaceForward(sTun.name(), sTun2.name()); + EXPECT_TRUE(status.isOk()) << status.exceptionMessage(); + expectIpfwdRuleNotExists(sTun.name().c_str(), sTun2.name().c_str()); } namespace { |