Increase test coverage

Author: ClaudiuGeorgiu

adb/adb.py

@@ -228,7 +228,8 @@ def connect(self, host: str = None, timeout: Optional[int] = None) -> str:
         output = self.execute(connect_cmd, timeout=timeout)
 
         # Make sure the connect operation ended successfully.
-        if output and 'unable to connect' in output.lower():
+        if output and any(error in output.lower()
+                          for error in ['unable to connect', 'cannot connect', 'cannot resolve']):
             raise RuntimeError('Something went wrong during the connect operation: {0}'.format(output))
         else:
             return output
@@ -250,7 +251,7 @@ def remount(self, timeout: Optional[int] = None) -> str:
         else:
             raise RuntimeError('Something went wrong during the remount operation: {0}'.format(output))
 
-    def reboot(self, timeout: Optional[int] = None) -> None:
+    def reboot(self, timeout: Optional[int] = None) -> str:
         """
         Reboot the Android device connected through adb.
 

requirements.txt

@@ -1 +1,2 @@
-pytest-cov==2.6.1
+pytest-cov==2.8.1
+pytest-ordering==0.6

test/test_adb.py

@@ -58,6 +58,21 @@ def test_adb_device_connected(self, adb_instance: ADB):
         assert isinstance(connected_devices[0], str)
         assert connected_devices[0] is not ''
 
+    def test_adb_connection_error(self, adb_instance: ADB):
+        with pytest.raises(RuntimeError):
+            adb_instance.connect('unknown', timeout=30)
+
+    @pytest.mark.second_to_last
+    def test_adb_remount_error(self, adb_instance: ADB):
+        with pytest.raises(RuntimeError):
+            # This should fail because "adb root" was not executed.
+            adb_instance.remount(timeout=30)
+
+    @pytest.mark.last
+    def test_adb_reboot(self, adb_instance: ADB):
+        result = adb_instance.reboot(timeout=300)
+        assert result == ''
+
 
 class TestCommandExecution(object):