Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: I6bddf77824763929d694e153e8fa4cccde5d34ea
This commit is contained in:
Nucca Chen 2022-01-26 15:22:50 +00:00 • committed by Automerger Merge Worker
commit dc86ef31c6

View file

@ -340,7 +340,7 @@ public class ClatCoordinatorTest {
inOrder.verifyNoMoreInteractions();
// [2] Start clatd again failed.
assertThrows("java.io.IOException: Clatd has started on test0 (pid 10483)",
assertThrows("java.io.IOException: Clatd is already running on test0 (pid 10483)",
IOException.class,
() -> coordinator.clatStart(BASE_IFACE, NETID, NAT64_IP_PREFIX));