diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38e4655265..132ba9384e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,6 @@ jobs: python3 -m venv ci ci/bin/pip install -r scripts/requirements.txt ci/bin/python scripts/run_tests.py --changes_only --commit_id ${{ github.event.pull_request.base.sha }} - ci/bin/python scripts/run_tests.py --changes_only --concurrency --commit_id ${{ github.event.pull_request.base.sha }} env: SEED: 0 @@ -129,7 +128,6 @@ jobs: python3 -m venv ci ci/bin/pip install -r scripts/requirements.txt ci/bin/python scripts/run_tests.py - ci/bin/python scripts/run_tests.py --concurrency env: SEED: 0 diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 619b6542fa..11f1d8efbd 100755 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -75,7 +75,7 @@ def packages_to_test_due_to_global_changes(files: List[str]) -> Set[str]: return set() -def run_test(changes_only: bool, commit_id: Optional[str], concurrency: bool): +def run_test(changes_only: bool, commit_id: Optional[str]): local_changes = get_local_changes(".", commit_id=commit_id) modified_packages = get_modified_packages(local_changes) args = [] @@ -100,12 +100,6 @@ def run_test(changes_only: bool, commit_id: Optional[str], concurrency: bool): # args). cmd = ["cargo", "test"] + args - # TODO: Less specific handling of active feature combinations in tests (which combos should be - # tested and which shouldn't?). - # If blockifier is to be tested, add the concurrency flag if requested. - if concurrency and "blockifier" in tested_packages: - cmd.extend(["--features", "concurrency"]) - print("Running tests...") print(cmd, flush=True) subprocess.run(cmd, check=True) @@ -115,18 +109,13 @@ def run_test(changes_only: bool, commit_id: Optional[str], concurrency: bool): def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser(description="Presubmit script.") parser.add_argument("--changes_only", action="store_true") - parser.add_argument( - "--concurrency", - action="store_true", - help="If blockifier is to be tested, add the concurrency flag.", - ) parser.add_argument("--commit_id", type=str, help="GIT commit ID to compare against.") return parser.parse_args() def main(): args = parse_args() - run_test(changes_only=args.changes_only, commit_id=args.commit_id, concurrency=args.concurrency) + run_test(changes_only=args.changes_only, commit_id=args.commit_id) if __name__ == "__main__":