am b091fd20: CameraITS: fix two failing tests

* commit 'b091fd20a0e22a211d5fcc06ba911187a0124bcb':
  CameraITS: fix two failing tests

2 files changed, 5 insertions, 5 deletions

diff --git a/apps/CameraITS/tests/scene0/test_metadata.py b/apps/CameraITS/tests/scene0/test_metadata.py
index 5e21bb9..b4ca4cb 100644
--- a/apps/CameraITS/tests/scene0/test_metadata.py
+++ b/apps/CameraITS/tests/scene0/test_metadata.py
@@ -49,16 +49,13 @@ def main():
     check('props["android.info.supportedHardwareLevel"] in [0,1,2]')
     full = getval('props["android.info.supportedHardwareLevel"]') == 1
 
-    # Test: rollingShutterSkew, frameDuration, and
-    # availableMinFrameDurations tags must all be present, and
-    # rollingShutterSkew must be greater than zero and smaller than all
+    # Test: rollingShutterSkew, and frameDuration tags must all be present,
+    # and rollingShutterSkew must be greater than zero and smaller than all
     # of the possible frame durations.
     check('md.has_key("android.sensor.frameDuration")')
     check('md["android.sensor.frameDuration"] is not None')
     check('md.has_key("android.sensor.rollingShutterSkew")')
     check('md["android.sensor.rollingShutterSkew"] is not None')
-    check('props.has_key("android.scaler.availableMinFrameDurations")')
-    check('props["android.scaler.availableMinFrameDurations"] is not None')
     check('md["android.sensor.frameDuration"] > '
           'md["android.sensor.rollingShutterSkew"] > 0')
 
diff --git a/apps/CameraITS/tests/scene1/test_capture_result.py b/apps/CameraITS/tests/scene1/test_capture_result.py
index 81ec43c..ee3c91c 100644
--- a/apps/CameraITS/tests/scene1/test_capture_result.py
+++ b/apps/CameraITS/tests/scene1/test_capture_result.py
@@ -20,6 +20,9 @@ import os.path
 import numpy
 import matplotlib.pyplot
 
+# Required for 3d plot to work
+import mpl_toolkits.mplot3d
+
 def main():
     """Test that valid data comes back in CaptureResult objects.
     """