commit 616cc3dca90d5117eeadd72af2d664629c6f225f
author Chalard Jean <jchalard@google.com> Thu Aug 06 13:10:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 13:10:36 2020 +0000
tree 472f5aebe723128d4d4bfe1e03da6a442b756cc4
parent 84561026d06fcfbc961c11d12372c83f42fc21c3
parent f54a70cdcd672a6ec8c44aebd61d1170cfc6eb4f

Merge "Resolve the endpoint in legacy VPN" am: f54a70cdcd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de

tests/net/java/com/android/server/connectivity/VpnTest.java

diff --git a/tests/net/java/com/android/server/connectivity/VpnTest.java b/tests/net/java/com/android/server/connectivity/VpnTest.java
index a9313a3..de1c575 100644
--- a/tests/net/java/com/android/server/connectivity/VpnTest.java
+++ b/tests/net/java/com/android/server/connectivity/VpnTest.java
@@ -98,7 +98,6 @@
 import com.android.server.IpSecService;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -1054,7 +1053,6 @@
     }
 
     @Test
-    @Ignore("b/158974172") // remove when the bug is fixed
     public void testStartRacoonHostname() throws Exception {
         startRacoon("hostname", "5.6.7.8"); // address returned by deps.resolve
     }