diff options
author | Julien Desprez <jdesprez@google.com> | 2016-07-05 08:42:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-05 08:42:11 +0000 |
commit | e8555ba4cd68a59ee0a3871dfb8d7b74e5b6f3f9 (patch) | |
tree | 938e4012a1c96e23f23ec0c1bd98b9832624faaa /src/com/android/tradefed | |
parent | 8f9195f188896ceba98a4c6ed15a5665236db771 (diff) | |
parent | cc92e1ee1d152c2b1c0410b7c5eedb858961326f (diff) | |
download | tradefederation-e8555ba4cd68a59ee0a3871dfb8d7b74e5b6f3f9.tar.gz |
Merge "Speed up some unit tests"
Diffstat (limited to 'src/com/android/tradefed')
-rw-r--r-- | src/com/android/tradefed/targetprep/FastbootDeviceFlasher.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/tradefed/targetprep/FastbootDeviceFlasher.java b/src/com/android/tradefed/targetprep/FastbootDeviceFlasher.java index e0076aa14..96ec06979 100644 --- a/src/com/android/tradefed/targetprep/FastbootDeviceFlasher.java +++ b/src/com/android/tradefed/targetprep/FastbootDeviceFlasher.java @@ -23,6 +23,7 @@ import com.android.tradefed.log.LogUtil.CLog; import com.android.tradefed.util.CommandResult; import com.android.tradefed.util.CommandStatus; import com.android.tradefed.util.FileUtil; +import com.android.tradefed.util.IRunUtil; import com.android.tradefed.util.RunUtil; import com.android.tradefed.util.ZipUtil; @@ -565,7 +566,7 @@ public class FastbootDeviceFlasher implements IDeviceFlasher { attempts++; CLog.w("Could not find version for '%s'. Output '%s', retrying.", imageName, queryOutput); - RunUtil.getDefault().sleep(RETRY_SLEEP * (attempts - 1) + getRunUtil().sleep(RETRY_SLEEP * (attempts - 1) + new Random(System.currentTimeMillis()).nextInt(RETRY_SLEEP)); continue; } @@ -575,6 +576,13 @@ public class FastbootDeviceFlasher implements IDeviceFlasher { } /** + * Exposed for testing. + */ + protected IRunUtil getRunUtil() { + return RunUtil.getDefault(); + } + + /** * Helper method to execute fastboot command. * * @param device the {@link ITestDevice} to execute command on |