Skip to content

ref: Remove JS tests from precommit #29155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untitaker merged 2 commits into from
Nov 5, 2021
Merged

ref: Remove JS tests from precommit #29155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc9127
ref: Remove JS tests from precommit
untitaker Oct 7, 2021
60eadcb
Merge remote-tracking branch 'origin/master' into fix/remove-js-tests…
untitaker Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def main():

files_modified = [text_type(f) for f in get_modified_files(os.getcwd()) if os.path.exists(f)]

return run(files_modified, test=True)
return run(files_modified)


if __name__ == "__main__":
Expand Down
33 changes: 0 additions & 33 deletions src/sentry/lint/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,28 +228,6 @@ def js_lint_format(file_list=None):
return has_errors or has_package_json_errors


def js_test(file_list=None):
"""
Run JavaScript unit tests on relevant files ONLY as part of pre-commit hook
"""
jest_path = get_node_modules_bin("jest")

if not os.path.exists(jest_path):
sys.stdout.write(
"[sentry.test] Skipping JavaScript testing because jest is not installed.\n"
)
return False

js_file_list = get_js_files(file_list)

has_errors = False
if js_file_list:
status = Popen(["yarn", "test-precommit"] + js_file_list).wait()
has_errors = status != 0

return has_errors


def less_format(file_list=None):
"""
We only format less code as part of this pre-commit hook. It is not part
Expand Down Expand Up @@ -300,10 +278,8 @@ def run(
format=True,
lint=True,
js=True,
py=True,
less=True,
yarn=True,
test=False,
parseable=False,
):
old_sysargv = sys.argv
Expand All @@ -321,9 +297,6 @@ def run(
return 1

if format:
if py:
# python autoformatting is now done via pre-commit (black)
pass
Comment on lines -324 to -326
Copy link
Member Author

@untitaker untitaker Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see an obvious reason as to why if x: pass is something worthwhile to keep in code...

if js:
# run eslint with --fix and skip these linters down below
results.append(js_lint_format(file_list))
Expand All @@ -335,8 +308,6 @@ def run(
return 1

if lint:
if py:
pass # flake8 linting was moved to pre-commit
if js:
# stylelint `--fix` doesn't work well
results.append(js_stylelint(file_list, parseable=parseable, format=format))
Expand All @@ -345,10 +316,6 @@ def run(
# these tasks are called when we need to format, so skip it here
results.append(js_lint(file_list, parseable=parseable, format=format))

if test:
if js:
results.append(js_test(file_list))

if any(results):
return 1
return 0
Expand Down