Merge "Resolve the endpoint in legacy VPN" am: f54a70cdcd am: 616cc3dca9 am: 3285d0fca0

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

Change-Id: I96691f6091c43377f23a00621242ed034fcb0444
This commit is contained in:
Chalard Jean
2020-08-06 16:35:54 +00:00
committed by Automerger Merge Worker

View File

@@ -98,7 +98,6 @@ import com.android.internal.net.VpnProfile;
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 @@ public class VpnTest {
}
@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
}