commit d5c6b4c75f7c1498ead95feedc081e4b8163f317
author chiachangwang <chiachangwang@google.com> Wed Nov 23 01:29:11 2022 +0000
committer chiachangwang <chiachangwang@google.com> Wed Nov 23 02:00:41 2022 +0000
tree 657ecb0c1a162cd399ac175b00d0cdad64dbd35c
parent 4ad7cdedb7bdd943af9f910fbb97c4874ff09eab

Always add both v4 and v6 routes for each tests

This is a follow up commit from aosp/2125292 to always add
both v4 and v6 routes regardless of whether the code is
testing v4 or v6. Tests should behave the same with dual stack
routes.

Bug: 247902393
Test: cd system/netd ; atest
Change-Id: Id89549e6c9efc0a6df0887333e3e5e1d09f29b91

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index d10ac6a..33a9d69 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -4543,14 +4543,12 @@
 // to work because the routes don't overlap. If differentLocalRoutes is false, these routes are also
 // configured on the per-app default network.
 // For both IPv4 and IPv6, the first route is local, the second is not.
-std::vector<std::string> V6_ROUTES = {"2001:db8:cafe::/48", "::/0"};
-std::vector<std::string> V4_ROUTES = {"192.168.0.0/16", "0.0.0.0/0"};
-
+std::vector<std::string> SYSTEM_DEFAULT_ROUTES = {"192.168.0.0/16", "0.0.0.0/0",
+                                                  "2001:db8:cafe::/48", "::/0"};
 // Routes configured on the per-app default network if differentLocalRoutes is true.
 // For both IPv4 and IPv6, the first route is local, the second is not.
-std::vector<std::string> V6_APP_DEFAULT_ROUTES = {"2607:f0d0:1234::/48", "::/0"};
-std::vector<std::string> V4_APP_DEFAULT_ROUTES = {"172.16.0.0/16", "0.0.0.0/0"};
-
+std::vector<std::string> APP_DEFAULT_ROUTES = {"172.16.0.0/16", "0.0.0.0/0", "2607:f0d0:1234::/48",
+                                               "::/0"};
 void NetdBinderTest::setupNetworkRoutesForVpnAndDefaultNetworks(
         int systemDefaultNetId, int appDefaultNetId, int vpnNetId, int otherNetId, bool secure,
         bool testV6, bool differentLocalRoutes, std::vector<UidRangeParcel>&& appDefaultUidRanges,
@@ -4562,8 +4560,7 @@
     // are routed correctly.
 
     // Setup system default routing.
-    std::vector<std::string> systemDefaultRoutes = testV6 ? V6_ROUTES : V4_ROUTES;
-    for (const auto& route : systemDefaultRoutes) {
+    for (const auto& route : SYSTEM_DEFAULT_ROUTES) {
         EXPECT_TRUE(mNetd->networkAddRoute(systemDefaultNetId, sTun.name(), route, "").isOk());
     }
 
@@ -4572,8 +4569,7 @@
 
     // Setup app default routing.
     std::vector<std::string> appDefaultRoutes =
-            testV6 ? (differentLocalRoutes ? V6_APP_DEFAULT_ROUTES : V6_ROUTES)
-                   : (differentLocalRoutes ? V4_APP_DEFAULT_ROUTES : V4_ROUTES);
+            (differentLocalRoutes ? APP_DEFAULT_ROUTES : SYSTEM_DEFAULT_ROUTES);
     for (const auto& route : appDefaultRoutes) {
         EXPECT_TRUE(mNetd->networkAddRoute(appDefaultNetId, sTun2.name(), route, "").isOk());
     }
@@ -4585,8 +4581,7 @@
     EXPECT_TRUE(mNetd->networkAddInterface(vpnNetId, sTun3.name()).isOk());
 
     // Setup vpn routing.
-    std::vector<std::string> vpnRoutes = testV6 ? V6_ROUTES : V4_ROUTES;
-    for (const auto& route : vpnRoutes) {
+    for (const auto& route : SYSTEM_DEFAULT_ROUTES) {
         EXPECT_TRUE(mNetd->networkAddRoute(vpnNetId, sTun3.name(), route, "").isOk());
     }