commit 00b2f18c37952d77ef90a1eea35513ef6bf3a28e
author Maciej Żenczykowski <maze@google.com> Fri Oct 28 03:08:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 03:08:29 2022 +0000
tree af52a422cc92598b8d18148a2924dbe7693b0fb4
parent ef017fc42bfdedf7918e215f2068e9df16697a63
parent f76b8d67f85dac34d93212294ade6a4fbdb141bb

Merge "ClatCoordinatorTest: override test generateIpv6Address correctly"

tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java

diff --git a/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java b/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
index 49e3514..b651c33 100644
--- a/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
+++ b/tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
@@ -222,7 +222,7 @@
         public String generateIpv6Address(@NonNull String iface, @NonNull String v4,
                 @NonNull String prefix64, int mark) throws IOException {
             if (BASE_IFACE.equals(iface) && XLAT_LOCAL_IPV4ADDR_STRING.equals(v4)
-                    && NAT64_PREFIX_STRING.equals(prefix64)) {
+                    && NAT64_PREFIX_STRING.equals(prefix64) && MARK == mark) {
                 return XLAT_LOCAL_IPV6ADDR_STRING;
             }
             fail("unsupported args: " + iface + ", " + v4 + ", " + prefix64 + ", " + mark);