summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2014-04-05 00:54:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-05 00:54:54 +0000
commit52ddc781a19aac3b8165b4340f0c0e17e097468f (patch)
treefd0df4b045095eef8f149e352a27079eaa811d93 /tests
parent6068967fd946ccfcc8c69a698c0988f6e6f56ea4 (diff)
parent70ce016f84ce6c54b2c5f07adf86e415de5598cb (diff)
downloadpackages_apps_Settings-52ddc781a19aac3b8165b4340f0c0e17e097468f.zip
packages_apps_Settings-52ddc781a19aac3b8165b4340f0c0e17e097468f.tar.gz
packages_apps_Settings-52ddc781a19aac3b8165b4340f0c0e17e097468f.tar.bz2
am 70ce016f: am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '70ce016f84ce6c54b2c5f07adf86e415de5598cb': 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.java7
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);