Adding larger timeouts for some CtsDevicePolicyManagerTestCases tests
On low end devices, managed profile provisioning operations might be
slow, causing some tests to fail due to timeout. By increasing the
timeouts we prevent this from occurring.
Bug: 146081599
Change-Id: Ief360ea184e621961cbcfe4e29e6f590b5509b36
Merged-In: Ief360ea184e621961cbcfe4e29e6f590b5509b36
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
index ae6849c..f27ab55 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
@@ -93,13 +93,15 @@
}
mReceivedProfileProvisionedIntent =
- managedProfileProvisionedReceiver.awaitForBroadcast();
+ managedProfileProvisionedReceiver.awaitForBroadcast(
+ TimeUnit.SECONDS.toMillis(TIMEOUT_SECONDS));
if (mReceivedProfileProvisionedIntent == null) {
Log.i(TAG, "managedProfileProvisionedReceiver.awaitForBroadcast(): failed");
return false;
}
- if (managedProfileAddedReceiver.awaitForBroadcast() == null) {
+ if (managedProfileAddedReceiver.awaitForBroadcast(
+ TimeUnit.SECONDS.toMillis(TIMEOUT_SECONDS)) == null) {
Log.i(TAG, "managedProfileAddedReceiver.awaitForBroadcast(): failed");
return false;
}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
index 05edf1a..59f3ebf 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
@@ -93,13 +93,15 @@
}
mReceivedProfileProvisionedIntent =
- managedProfileProvisionedReceiver.awaitForBroadcast();
+ managedProfileProvisionedReceiver.awaitForBroadcast(
+ TimeUnit.SECONDS.toMillis(TIMEOUT_SECONDS));
if (mReceivedProfileProvisionedIntent == null) {
Log.i(TAG, "managedProfileProvisionedReceiver.awaitForBroadcast(): failed");
return false;
}
- if (managedProfileAddedReceiver.awaitForBroadcast() == null) {
+ if (managedProfileAddedReceiver.awaitForBroadcast(
+ TimeUnit.SECONDS.toMillis(TIMEOUT_SECONDS)) == null) {
Log.i(TAG, "managedProfileAddedReceiver.awaitForBroadcast(): failed");
return false;
}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
index 0280bdf..86af199 100755
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
@@ -59,7 +59,7 @@
private static final String SERIAL_EXTRA = "serialExtra";
private static final String PROFILE_OWNER_EXTRA = "profileOwnerExtra";
private static final String SETUP_COMPLETE_EXTRA = "setupCompleteExtra";
- private static final int BROADCAST_TIMEOUT = 15_000;
+ private static final int BROADCAST_TIMEOUT = 60_000;
private static final int USER_SWITCH_DELAY = 10_000;
private static final String AFFILIATION_ID = "affiliation.id";
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DisallowSharingIntoProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DisallowSharingIntoProfileTest.java
index 8f1f88e..9ddc92f 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DisallowSharingIntoProfileTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DisallowSharingIntoProfileTest.java
@@ -176,7 +176,8 @@
UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE);
}
// Wait for the restriction to apply
- assertTrue("Restriction not applied after 5 seconds", latch.await(5, TimeUnit.SECONDS));
+ assertTrue("Restriction not applied after 60 seconds",
+ latch.await(60, TimeUnit.SECONDS));
} finally {
mContext.unregisterReceiver(receiver);
}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
index b81afd2..d551872 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
@@ -85,7 +85,7 @@
private static final String PROFILE_CREDENTIAL = "1234";
// This should be sufficiently larger than ProfileTimeoutTestHelper.TIMEOUT_MS
- private static final int PROFILE_TIMEOUT_DELAY_MS = 10_000;
+ private static final int PROFILE_TIMEOUT_DELAY_MS = 60_000;
//The maximum time to wait for user to be unlocked.
private static final long USER_UNLOCK_TIMEOUT_NANO = 30_000_000_000L;
