commit 988c6471aa8e8094135b7644438e9d28efd2992d
author David Haddock <dhaddock@chromium.org> Tue Mar 24 20:52:54 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Mar 26 02:36:49 2015 +0000
tree f408d592dfc9741318ea3399fd4181f879d1919f
parent fa27f5ba41ac278d0fc52b2e5037334fee931a20

Adding check for mobile data connection to image comparison tests

Tests needs to know if mobile data is available on the device before 
retrieving golden image. Also updates AppLauncher parameters to agree 
with underlying graphics library functions.

BUG=None
TEST=this

Change-Id: I4c36d604a2fe48b624f94c12ddc3126b3d4fe598
Reviewed-on: https://chromium-review.googlesource.com/262360
Tested-by: David Haddock <dhaddock@chromium.org>
Reviewed-by: Katherine Threlkeld <kathrelkeld@chromium.org>
Reviewed-by: Mussa Kiroga <mussa@chromium.org>
Commit-Queue: David Haddock <dhaddock@chromium.org>

client/site_tests/ui_AppLauncher/ui_AppLauncher.py

diff --git a/client/site_tests/ui_AppLauncher/ui_AppLauncher.py b/client/site_tests/ui_AppLauncher/ui_AppLauncher.py
index f9db117..738e74a 100644
--- a/client/site_tests/ui_AppLauncher/ui_AppLauncher.py
+++ b/client/site_tests/ui_AppLauncher/ui_AppLauncher.py
@@ -61,7 +61,8 @@
 
             # Take a screenshot and crop to just the launcher
             w, h = graphics_utils.get_display_resolution()
-            box = (w - self.width, h - self.height, self.width, self.height)
+            box = (w - self.width * 2, h - self.height * 2, self.width,
+                   self.height)
             graphics_utils.take_screenshot_crop(filepath, box)
 
 

client/site_tests/ui_SettingsPage/ui_SettingsPage.py

diff --git a/client/site_tests/ui_SettingsPage/ui_SettingsPage.py b/client/site_tests/ui_SettingsPage/ui_SettingsPage.py
index 13ab0f0..a97e51a 100644
--- a/client/site_tests/ui_SettingsPage/ui_SettingsPage.py
+++ b/client/site_tests/ui_SettingsPage/ui_SettingsPage.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib.cros import chrome
 from autotest_lib.client.cros.ui import ui_test_base
 from autotest_lib.client.common_lib import error
@@ -40,10 +41,14 @@
                 raise error.TestFailure('Could not capture screenshot')
 
             image_util.WritePngFile(screenshot, filepath)
-            self.draw_image_mask(filepath, self.mask_points)
 
 
     def run_once(self, mask_points):
         self.mask_points = mask_points
+
+        # Check if we should find mobile data in settings
+        mobile = utils.system_output('modem status')
+        if mobile:
+            self.tagged_testname += '.mobile'
         self.run_screenshot_comparison_test()