Skip to content

Commit

Permalink
Merge pull request juju#1069 from cderici/fix-make-test-target
Browse files Browse the repository at this point in the history
juju#1069

#### Description

Tests run the linter before running .tox which crashes because tox wants to see the lint environment already generated. This swaps the operations so .tox target is run first to make sure the environments are generated before running anything.
  • Loading branch information
jujubot authored Jul 11, 2024
2 parents 4032529 + f4f6ebc commit 30c31b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ client:
$(PY) -m juju.client.facade -s "juju/client/schemas*" -o juju/client/

.PHONY: run-unit-tests
run-unit-tests: lint .tox
run-unit-tests: .tox lint
tox -e py3

.PHONY: run-integration-tests
run-integration-tests: lint .tox
run-integration-tests: .tox lint
tox -e integration

.PHONY: run-all-tests
Expand Down

0 comments on commit 30c31b5

Please sign in to comment.