Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/src/com/android/gallery3d/StressTests.java b/tests/src/com/android/gallery3d/StressTests.java
index 32eefdcec..b991e9e8d 100755
--- a/tests/src/com/android/gallery3d/StressTests.java
+++ b/tests/src/com/android/gallery3d/StressTests.java
@@ -41,7 +41,7 @@ public class StressTests extends TestSuite {
         result.addTestSuite(CameraLatency.class);
         result.addTestSuite(CameraStartUp.class);
         result.addTestSuite(ImageCapture.class);
-        result.addTestSuite(SwitchPreview.class);
+//      result.addTestSuite(SwitchPreview.class);
         return result;
     }
 }
diff --git a/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java b/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
index 57ae69125..d3fb10dad 100755
--- a/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
+++ b/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
@@ -25,8 +25,8 @@ public class CameraStressTestRunner extends InstrumentationTestRunner {
 
     // Default recorder settings
     public static int mVideoDuration = 20000; // set default to 20 seconds
-    public static int mVideoIterations = 100; // set default to 100 videos
-    public static int mImageIterations = 100; // set default to 100 images
+    public static int mVideoIterations = 1; // set default to 1 video
+    public static int mImageIterations = 10; // set default to 10 images
 
     @Override
     public TestSuite getAllTests() {