Merge pull request #4787 from p12tic/1.8.x-fix-tests

Fix various breakages due to moving dependencies

common/smokedist-download-compatible-chromedriver.py

@@ -19,9 +19,9 @@ def parse_chrome_major_version(output):
         # e.g.:
         # Chromium 69.0.3497.81 Built on Ubuntu , running on Ubuntu 18.04
         # Google Chrome 70.0.3538.77
-        m = re.match(r'.*[cC]hrom.*\s(\d+)\.\d+\.\d+(?:\.\d+|).*', line)
+        m = re.match(r'.*[cC]hrom.*\s(\d+)\.(\d+)\.(\d+)(?:\.\d+|).*', line)
         if m is not None:
-            return int(m.group(1))
+            return int(m.group(1)), int(m.group(2)), int(m.group(3))
     return None
 
 
@@ -41,29 +41,6 @@ def get_chrome_version(browsers):
     return (None, None)
 
 
-def parse_chromedriver_compatibility_map(notes):
-    ret = {}
-    lines = notes.splitlines()
-    for i in range(len(lines) - 1):
-        m1 = re.match(r'--+ChromeDriver v(\d+\.\d+) .*', lines[i])
-        m2 = re.match(r'Supports Chrome v(\d+)-(\d+).*', lines[i+1])
-        m3 = re.match(r'Supports Chrome v(\d+).*', lines[i+1])
-        if m1 is not None and (m2 is not None or m3 is not None):
-            chromedrive_version = m1.group(1)
-            if m2 is not None:
-                chrome_version_min = int(m2.group(1))
-                chrome_version_max = int(m2.group(2)) + 1
-            else:
-                chrome_version_min = int(m3.group(1))
-                chrome_version_max = int(m3.group(1)) + 1
-            for version in range(chrome_version_min, chrome_version_max):
-                # prefer newer chromedriver, assuming it is first in notes
-                if version not in ret:
-                    ret[version] = chromedrive_version
-
-    return ret
-
-
 def get_chromedriver_compatibility_map():
     chromedriver_root = 'https://chromedriver.storage.googleapis.com'
 
@@ -100,16 +77,33 @@ def main():
 
         print('Using {0} release {1}'.format(browser, version))
 
-        compat_map = get_chromedriver_compatibility_map()
+        chrome_major, chrome_minor, chrome_patch = version
 
-        if version not in compat_map:
-            raise Exception('Unknown {0} version {1}'.format(browser, version))
+        if chrome_major >= 73:
+            # webdriver manager requires us to provide the 4th version component, however does not
+            # use it when picking the version to download
+            chromedriver_version = '{}.{}.{}.0'.format(chrome_major, chrome_minor, chrome_patch)
+        else:
+            chrome_major_to_chromedriver = {
+                73: '2.46',
+                72: '2.46',
+                71: '2.46',
+                70: '2.45',
+                69: '2.44',
+            }
+            if chrome_major not in chrome_major_to_chromedriver:
+                raise Exception('Unknown Chrome version {}.{}.{}'.format(
+                    chrome_major, chrome_minor, chrome_patch))
+            chromedriver_version = chrome_major_to_chromedriver[chrome_major]
 
-        chromedriver_version = compat_map[version]
         print('Using chromedriver release {0}'.format(chromedriver_version))
 
-        check_call([args.manager + ' update --versions.chrome ' +
-                   chromedriver_version], shell=True)
+        cmd = [args.manager, 'update', '--versions.chrome',
+               chromedriver_version, '--versions.standalone', '3.141.59']
+        print('Calling: ' + ' '.join(cmd))
+
+        check_call(cmd)
+
         return
 
     except Exception as e:

master/buildbot/www/plugin.py

@@ -28,10 +28,10 @@ class Application(object):
     def __init__(self, modulename, description, ui=True):
         self.description = description
         self.version = pkg_resources.resource_string(
-            modulename, "/VERSION").strip()
+            modulename, "VERSION").strip()
         self.version = bytes2NativeString(self.version)
         self.static_dir = pkg_resources.resource_filename(
-            modulename, "/static")
+            modulename, "static")
         self.resource = static.File(self.static_dir)
         self.ui = ui
 

requirements-ci.txt

@@ -20,7 +20,7 @@ cryptography==2.4.2
 decorator==4.3.0
 dicttoxml==1.7.4
 docutils==0.14
-enum34==1.1.6
+enum34==1.1.6; python_version < "3.4"
 flake8==3.6.0
 funcparserlib==0.3.6
 funcsigs==1.0.2

smokes/package.json

@@ -5,7 +5,7 @@
     "main": "index.js",
     "dependencies": {
         "jasmine-spec-reporter": "^4.2.1",
-        "protractor": "^5.1.0",
+        "protractor": "^5.4.2",
         "ts-node": "~4.1.0",
         "tslint": "~5.9.1",
         "typescript": "^2.5.3"

www/base/guanlecoja/config.coffee

@@ -49,7 +49,7 @@ config =
                 version: "~3.1.1"
                 files: []
             'buildbot-data':
-                version: '~2.2.2'
+                version: '~2.2.2 < 2.2.5'
                 files: 'dist/buildbot-data.js'
             "angular-bootstrap-multiselect":
                 version: "https://github.com/bentorfs/angular-bootstrap-multiselect.git#^1.1.6"

www/console_view/guanlecoja/config.coffee

@@ -20,7 +20,7 @@ module.exports =
                 version: ANGULAR_TAG
                 files: "angular-mocks.js"
             'buildbot-data':
-                version: '~2.1.0'
+                version: '~2.1.0 < 2.2.5'
                 files: 'dist/buildbot-data.js'
 
     karma:

www/grid_view/guanlecoja/config.coffee

@@ -26,7 +26,7 @@ module.exports =
                 version: '~1.5.3'
                 files: "angular-mocks.js"
             'buildbot-data':
-                version: '~2.2.0'
+                version: '~2.2.0 < 2.2.5'
                 files: 'dist/buildbot-data.js'
 
     karma:

www/waterfall_view/guanlecoja/config.coffee

@@ -24,7 +24,7 @@ module.exports =
                 version: "3.4.11"
                 files: "d3.js"
             'buildbot-data':
-                version: '~2.1.0'
+                version: '~2.1.0 < 2.2.5'
                 files: 'dist/buildbot-data.js'
     karma:
         # we put tests first, so that we have angular, and fake app defined