refactor

Author: link89

device_lab/services/selenium_grid.py

@@ -70,10 +70,10 @@ def get_all_hubs_url(self):
         return list(hub.url for hub in hubs)
 
     def get_available_capabilities(self, platform_name,
-                                   platform_version, min_platform_version, max_platform_version):
+                                   platform_version=None, min_platform_version=None, max_platform_version=None):
         query = Observable.from_(self._capabilities) \
             .filter(lambda c: platform_name is None or c['capabilities']['platformName'] == platform_name) \
-            .filter(lambda c: len(platform_version) == 0 or c['capabilities']['version'] in platform_version) \
+            .filter(lambda c: not platform_version or c['capabilities']['version'] in platform_version) \
             .filter(lambda c: min_platform_version is None or c['capabilities']['version'] >= min_platform_version) \
             .filter(lambda c: max_platform_version is None or c['capabilities']['version'] <= max_platform_version)
         candidates = list(query.to_blocking())

device_lab/tests/test_selenium_grid.py

@@ -2,7 +2,7 @@
 import tornado.testing
 
 from utils.clients.selenium_grid import SeleniumGridClient
-from services.selenium_grid import selenium_grid_service
+from services.selenium_grid import SeleniumGridService
 from services.selenium_grid import SimpleLockManager
 from time import sleep
 
@@ -17,13 +17,68 @@ def test_get_devices(self):
 
 
 class TestSeleniumGridService(unittest.TestCase):
-    def test_query_deivces1(self):
-        selenium_grid_service.update_hubs_detail(HUBS_DETAIL)
-        selenium_grid_service.get_available_capabilities(platform_name='ios')
+    def setUp(self):
+        self.service = SeleniumGridService()
+        self.service.set_capabilities([
+            {
+                "capabilities": {
+                    "platformName": "ios",
+                    "version": "1",
+                    "UDID": "udid1",
+                },
+                "appium_url": "appium_url1",
+            },
+            {
+                "capabilities": {
+                    "platformName": "ios",
+                    "version": "2",
+                    "UDID": "udid2",
+                },
+                "appium_url": "appium_url1",
+            },
+            {
+                "capabilities": {
+                    "platformName": "ios",
+                    "version": "1",
+                    "UDID": "udid1",
+                },
+                "appium_url": "appium_url2",
+            },
+            {
+                "capabilities": {
+                    "platformName": "ios",
+                    "version": "2",
+                    "UDID": "udid2",
+                },
+                "appium_url": "appium_url2",
+            },
+        ])
+
+    def test_query_capabilities(self):
+        caps = self.service.get_available_capabilities(platform_name='ios')
+        expected = [{'capabilities': {'platformName': 'ios', 'version': '1', 'UDID': 'udid1'}, 'appium_url': 'appium_url1'},
+                    {'capabilities': {'platformName': 'ios', 'version': '2', 'UDID': 'udid2'}, 'appium_url': 'appium_url2'}]
+        self.assertEqual(expected, caps)
+
+        caps = self.service.get_available_capabilities(platform_name='ios', platform_version=['1'])
+        expected = [{'capabilities': {'platformName': 'ios', 'version': '1', 'UDID': 'udid1'}, 'appium_url': 'appium_url1'}]
+        self.assertEqual(expected, caps)
+
+        caps = self.service.get_available_capabilities(platform_name='ios', min_platform_version='3')
+        self.assertEqual([], caps)
 
-    def test_query_devices2(self):
-        selenium_grid_service.update_hubs_detail(HUBS_DETAIL)
-        selenium_grid_service.get_available_capabilities(platform_name='ios', platform_version='11.2.6')
+        caps = self.service.get_available_capabilities(platform_name='ios', max_platform_version='0')
+        self.assertEqual([], caps)
+
+        caps = self.service.get_available_capabilities(platform_name='ios', min_platform_version='0')
+        expected = [{'capabilities': {'platformName': 'ios', 'version': '1', 'UDID': 'udid1'}, 'appium_url': 'appium_url1'},
+                    {'capabilities': {'platformName': 'ios', 'version': '2', 'UDID': 'udid2'}, 'appium_url': 'appium_url2'}]
+        self.assertEqual(expected, caps)
+
+        caps = self.service.get_available_capabilities(platform_name='ios', max_platform_version='3')
+        expected = [{'capabilities': {'platformName': 'ios', 'version': '1', 'UDID': 'udid1'}, 'appium_url': 'appium_url1'},
+                    {'capabilities': {'platformName': 'ios', 'version': '2', 'UDID': 'udid2'}, 'appium_url': 'appium_url2'}]
+        self.assertEqual(expected, caps)
 
 
 class TestSimpleLockManager(unittest.TestCase):
@@ -52,7 +107,10 @@ def test_lock_expired(self):
         self.assertFalse(self.lock.is_lock('lock1'))
 
 
-HUBS_DETAIL = {'http://10.32.52.92:4444/': {'nodes': [{'class': 'DefaultRemoteProxy',
+
+
+# this dto must be refactored !
+_GRID_RAW_DATA = {'http://10.32.52.92:4444/': {'nodes': [{'class': 'DefaultRemoteProxy',
     'id': 'http://10.32.60.38:4723',
     'protocols': {'web_driver': {'browsers': {'': {'10.1': [{'busy': False,
           'capabilities': {'UDID': 'F0F743D2-839B-4809-B404-B19AB4CDD31D',