| commit | aab2d554f9902a44c210140788ddc56053209a46 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Oct 28 03:43:23 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 28 03:43:23 2022 +0000 |
| tree | 2490a39fdebccf860456c1ab5d82b2f2e4d6d672 | |
| parent | f89a37363b7189d94b1a86913b57e9c9ec6db4da [diff] | |
| parent | 00b2f18c37952d77ef90a1eea35513ef6bf3a28e [diff] |
Merge "ClatCoordinatorTest: override test generateIpv6Address correctly" am: 00b2f18c37 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2272987 Change-Id: I140f44b8f41c811c1a3f31d89962880717640536 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);