Merge pull request #51 from jimboatarm/issue_45

Add network connectivity check

wlauto/common/android/device.py

@@ -649,9 +649,18 @@ class AndroidDevice(BaseLinuxDevice):  # pylint: disable=W0223
         except KeyError:
             return None
 
-    def is_wifi_connected(self):
-        self.logger.debug('Checking for wi-fi connectivity.')
-        return self.execute('dumpsys wifi| grep curState=ConnectedState')
+    def is_network_connected(self):
+        network_host = 'www.google.com'
+        self.logger.debug('Checking for internet connectivity.')
+        output = adb_shell(self.adb_name, 'ping -q -w 1 -c 1 {}'.format(network_host),
+                           timeout=self.default_timeout)
+
+        if not 'unknown host' in output:
+            self.logger.debug('Found network host {}'.format(network_host))
+            return True
+        else:
+            self.logger.debug('Cannot find network host {}'.format(network_host))
+            return False
 
     # Internal methods: do not use outside of the class.
 

wlauto/workloads/gmail/__init__.py

@@ -81,6 +81,9 @@ class Gmail(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Gmail, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
         # Check for workload dependencies before proceeding
         jpeg_files = [entry for entry in os.listdir(self.dependencies_directory) if entry.endswith(".jpg")]
 

wlauto/workloads/googlephotos/__init__.py

@@ -81,6 +81,9 @@ class Googlephotos(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Googlephotos, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
         # Check for workload dependencies before proceeding
         jpeg_files = [entry for entry in os.listdir(self.dependencies_directory) if entry.endswith(".jpg")]
 

wlauto/workloads/googleplaybooks/__init__.py

@@ -88,6 +88,9 @@ class Googleplaybooks(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Googleplaybooks, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
     def update_result(self, context):
         super(Googleplaybooks, self).update_result(context)
 

wlauto/workloads/multiapp/__init__.py

@@ -124,6 +124,9 @@ class Multiapp(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Multiapp, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
         # Check for workload dependencies before proceeding
         jpeg_files = [entry for entry in os.listdir(self.dependencies_directory) if entry.endswith(".jpg")]
 

wlauto/workloads/reader/__init__.py

@@ -102,6 +102,9 @@ class Reader(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Reader, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
         self.reader_local_dir = self.device.path.join(self.device.external_storage_directory,
                                                       'Android/data/com.adobe.reader/files/')
 

wlauto/workloads/skype/__init__.py

@@ -96,6 +96,9 @@ class Skype(AndroidUiAutoBenchmark):
     def initialize(self, context):
         super(Skype, self).initialize(context)
 
+        if not self.device.is_network_connected():
+            raise DeviceError('Network is not connected for device {}'.format(self.device.name))
+
     def setup(self, context):
         self.logger.info('===== setup() ======')
         super(Skype, self).setup(context)