From 946b7e38ebfed7f07fd6015f1cefbf6e816f56ac Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Fri, 12 Jan 2018 16:54:17 -0700 Subject: [PATCH] Bug 1430316: Lint the mozharness configs; r=jlund Differential Revision: https://phabricator.services.mozilla.com/D385 --HG-- extra : rebase_source : c4c6e2a4c28c29cc6906d2b757063ef38ac2209a --- testing/mozharness/configs/.flake8 | 33 +++++++++++++++++++ .../configs/android/androidarm_4_3.py | 2 -- .../mozharness/configs/android/androidx86.py | 2 -- .../mozharness/configs/awsy/macosx_config.py | 1 - .../single_locale/try_android-api-16.py | 1 - .../mozharness/configs/single_locale/win32.py | 2 -- .../configs/single_locale/win32_devedition.py | 2 -- .../mozharness/configs/single_locale/win64.py | 2 -- .../configs/single_locale/win64_devedition.py | 2 -- tools/lint/flake8.yml | 1 + 10 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 testing/mozharness/configs/.flake8 diff --git a/testing/mozharness/configs/.flake8 b/testing/mozharness/configs/.flake8 new file mode 100644 index 000000000000..b7b8bacff4f4 --- /dev/null +++ b/testing/mozharness/configs/.flake8 @@ -0,0 +1,33 @@ +[flake8] +ignore = + # From root + E121, E123, E126, E129, E133, E226, E241, E242, E704, W503, E402, + # The following errors should be fixed eventually + # line too long + E501, + # at least two spaces before inline comment + E261, + # continuation line under-indented for visual indent + E128, + # whitespace before ':' + E203, + # blank line at end of file + W391, + # multiple statements on one line + E702, + # closing bracket does not match visual indentation + E124, + # missing whitespace after ':' + E231, + # continuation line over-indented for visual indent + E127, + # too many leading '#' for block comment + E266, + # comment should start with '# ' + E262, E265, + # continuation line unaligned for hanging indent + E131, + # continuation line missing indentation or outdented + E122, +exclude = + test/test_malformed.py diff --git a/testing/mozharness/configs/android/androidarm_4_3.py b/testing/mozharness/configs/android/androidarm_4_3.py index cbc2b4ddaa25..79c48d4235d0 100644 --- a/testing/mozharness/configs/android/androidarm_4_3.py +++ b/testing/mozharness/configs/android/androidarm_4_3.py @@ -3,8 +3,6 @@ # This configuration should be combined with suite definitions and other # mozharness configuration from android_common.py, or similar. -import os - config = { "deprecated_sdk_path": True, "robocop_package_name": "org.mozilla.roboexample.test", diff --git a/testing/mozharness/configs/android/androidx86.py b/testing/mozharness/configs/android/androidx86.py index 0ff15b7e9daf..0fc3b5ec667a 100644 --- a/testing/mozharness/configs/android/androidx86.py +++ b/testing/mozharness/configs/android/androidx86.py @@ -3,8 +3,6 @@ # This configuration should be combined with suite definitions and other # mozharness configuration from android_common.py, or similar. -import os - config = { "deprecated_sdk_path": True, "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86/releng.manifest", diff --git a/testing/mozharness/configs/awsy/macosx_config.py b/testing/mozharness/configs/awsy/macosx_config.py index 9eadcec860cd..7b6488f9c553 100644 --- a/testing/mozharness/configs/awsy/macosx_config.py +++ b/testing/mozharness/configs/awsy/macosx_config.py @@ -1,5 +1,4 @@ import os -import platform PYTHON = "/usr/bin/env python" VENV_PATH = '%s/build/venv' % os.getcwd() diff --git a/testing/mozharness/configs/single_locale/try_android-api-16.py b/testing/mozharness/configs/single_locale/try_android-api-16.py index 950a31990263..9f7df73c79f7 100644 --- a/testing/mozharness/configs/single_locale/try_android-api-16.py +++ b/testing/mozharness/configs/single_locale/try_android-api-16.py @@ -16,7 +16,6 @@ config = { "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR, "locales_dir": "mobile/android/locales", "ignore_locales": ["en-US"], - "nightly_build": False, 'balrog_credentials_file': 'oauth.txt', "tools_repo": "https://hg.mozilla.org/build/tools", "tooltool_config": { diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py index 7d0bf644bed8..f7109e63daee 100644 --- a/testing/mozharness/configs/single_locale/win32.py +++ b/testing/mozharness/configs/single_locale/win32.py @@ -1,5 +1,3 @@ -import sys - config = { "platform": "win32", "stage_product": "firefox", diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py index 3f851e00be7f..3da87834f937 100644 --- a/testing/mozharness/configs/single_locale/win32_devedition.py +++ b/testing/mozharness/configs/single_locale/win32_devedition.py @@ -1,5 +1,3 @@ -import sys - config = { "platform": "win32", "stage_product": "firefox", diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py index e99338370251..f2c757e6f868 100644 --- a/testing/mozharness/configs/single_locale/win64.py +++ b/testing/mozharness/configs/single_locale/win64.py @@ -1,5 +1,3 @@ -import sys - config = { "platform": "win64", "stage_product": "firefox", diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py index 6becd08b5d02..2213cf0a9f74 100644 --- a/testing/mozharness/configs/single_locale/win64_devedition.py +++ b/testing/mozharness/configs/single_locale/win64_devedition.py @@ -1,5 +1,3 @@ -import sys - config = { "platform": "win64", "stage_product": "firefox", diff --git a/tools/lint/flake8.yml b/tools/lint/flake8.yml index 95d372f8f5a8..15994806e3e0 100644 --- a/tools/lint/flake8.yml +++ b/tools/lint/flake8.yml @@ -24,6 +24,7 @@ flake8: - testing/marionette/puppeteer - testing/mochitest - testing/mozbase + - testing/mozharness/configs - testing/mozharness/mozfile - testing/mozharness/mozharness/mozilla/mar.py - testing/mozharness/mozinfo