From 046cb422792c1152281a0a8d1d309bb8ef322632 Mon Sep 17 00:00:00 2001 From: manchandavishal Date: Mon, 14 Dec 2020 09:01:03 +0000 Subject: [PATCH] Run npm nodejs job with Firefox browser This patch update browser from Chrome to Firefox in karma.conf.js because nodejs fails with Chrome browser as not able to access some URL. So let's switch to Firefox browser now then we can use Chrome browser in future once this issue is resolved. It also updates few packages in 'lower-constraints.txt' to fix lower-constraints job. Change-Id: I1467fd00f3746c5c84233f31c8d41609d0345303 --- lower-constraints.txt | 13 ++++++------- package.json | 2 +- test-requirements.txt | 9 +++------ tools/install_venv.py | 1 + tox.ini | 2 +- zaqar_ui/karma.conf.js | 4 ++-- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index f6fdb2d..ec93e47 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -12,7 +12,7 @@ contextlib2==0.5.5 coverage==4.0 cryptography==2.1.4 debtcollector==1.19.0 -decorator==4.2.1 +decorator==4.4.1 deprecation==2.0 django-appconf==1.0.2 django-babel==0.6.2 @@ -25,9 +25,8 @@ dulwich==0.19.0 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 -flake8==2.5.5 futurist==1.6.0 -hacking==1.1.0 +hacking==3.0.1 horizon==17.1.0 idna==2.6 imagesize==1.0.0 @@ -37,10 +36,10 @@ jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.4.0 +keystoneauth1==3.18.0 linecache2==1.0.0 MarkupSafe==1.0 -mccabe==0.2.1 +mccabe==0.6.1 monotonic==1.4 msgpack==0.5.6 munch==2.2.0 @@ -49,7 +48,7 @@ netifaces==0.10.6 nodeenv==0.9.4 openstacksdk==0.12.0 os-client-config==1.29.0 -os-service-types==1.2.0 +os-service-types==1.7.0 osc-lib==1.10.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 @@ -66,7 +65,7 @@ pep8==1.5.7 Pint==0.8.1 prettytable==0.7.2 pycparser==2.18 -pyflakes==0.8.1 +pyflakes==2.1.0 Pygments==2.2.0 pyinotify==0.9.6 pymongo==3.6.1 diff --git a/package.json b/package.json index d5424a5..8fd58a9 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "eslint-plugin-angular": "1.0.1", "jasmine-core": "2.4.1", "karma": "1.1.2", - "karma-chrome-launcher": "1.0.1", + "karma-firefox-launcher": "2.1.0", "karma-cli": "1.0.1", "karma-coverage": "1.1.1", "karma-jasmine": "1.0.2", diff --git a/test-requirements.txt b/test-requirements.txt index c9ecee4..89db7ce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,11 +7,8 @@ # be installed in a specific order. # # Hacking should appear first in case something else depends on pep8 -hacking>=1.1.0,<1.2.0 # Apache-2.0 -# remove this pyflakes from here once you bump the -# hacking to 3.2.0 or above. hacking 3.2.0 takes -# care of pyflakes version compatibilty. -pyflakes>=2.1.1 -# +hacking>=3.0.1,<3.1.0 # Apache-2.0 + + coverage!=4.4,>=4.0 # Apache-2.0 testtools>=2.2.0 # MIT diff --git a/tools/install_venv.py b/tools/install_venv.py index 88b1963..c32c9f6 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -67,5 +67,6 @@ def main(argv): install.install_dependencies() print_help(venv, root) + if __name__ == '__main__': main(sys.argv) diff --git a/tox.ini b/tox.ini index 680e1e8..0e416f6 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ commands = {posargs} commands = flake8 {posargs} [flake8] -ignore = F405 +ignore = F405,W504 exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules max-complexity = 20 diff --git a/zaqar_ui/karma.conf.js b/zaqar_ui/karma.conf.js index 1846946..b4174017 100644 --- a/zaqar_ui/karma.conf.js +++ b/zaqar_ui/karma.conf.js @@ -124,14 +124,14 @@ module.exports = function (config) { frameworks: ['jasmine'], - browsers: ['Chrome'], + browsers: ['Firefox'], browserNoActivityTimeout: 60000, reporters: ['progress', 'coverage', 'threshold'], plugins: [ - 'karma-chrome-launcher', + 'karma-firefox-launcher', 'karma-jasmine', 'karma-ng-html2js-preprocessor', 'karma-coverage',