diff options
author | Xia Wang <xiaw@google.com> | 2014-04-05 00:48:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-05 00:48:38 +0000 |
commit | d2f56f07f97e72e62c51b82454d06de1e7b929a8 (patch) | |
tree | fa8bc824538063b27b10d2f466507d179ecb5b6b /tests | |
parent | 871322653c4109a9640b56374a246120c65f8241 (diff) | |
parent | ac768973bc23b9f8f266013c20d301554729fd70 (diff) | |
download | packages_apps_Settings-d2f56f07f97e72e62c51b82454d06de1e7b929a8.zip packages_apps_Settings-d2f56f07f97e72e62c51b82454d06de1e7b929a8.tar.gz packages_apps_Settings-d2f56f07f97e72e62c51b82454d06de1e7b929a8.tar.bz2 |
am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit 'ac768973bc23b9f8f266013c20d301554729fd70':
Allow VPN to stay connected for some time before disconnecting it.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/settings/vpn2/VpnTests.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/src/com/android/settings/vpn2/VpnTests.java b/tests/src/com/android/settings/vpn2/VpnTests.java index 2c6963a..7d5961d 100644 --- a/tests/src/com/android/settings/vpn2/VpnTests.java +++ b/tests/src/com/android/settings/vpn2/VpnTests.java @@ -89,6 +89,7 @@ public class VpnTests extends InstrumentationTestCase { private static final String TAG = "VpnTests"; /* Maximum time to wait for VPN connection */ private static final long MAX_CONNECTION_TIME = 5 * 60 * 1000; + private static final long VPN_STAY_TIME = 60 * 1000; private static final int MAX_DISCONNECTION_TRIES = 3; private static final String EXTERNAL_SERVER = "http://ip2country.sourceforge.net/ip2c.php?format=JSON"; @@ -149,6 +150,12 @@ public class VpnTests extends InstrumentationTestCase { mCertHelper = new CertInstallerHelper(); } + @Override + protected void tearDown() throws Exception { + sleep(VPN_STAY_TIME); + super.tearDown(); + } + private void printVpnProfile(VpnProfile profile) { Log.v(TAG, "profile: "); Log.v(TAG, "key: " + profile.key); |