Skip to content

Commit 30c31b5

Browse files
authored
Merge pull request #1069 from cderici/fix-make-test-target
#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.
2 parents 4032529 + f4f6ebc commit 30c31b5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ client:
2020
$(PY) -m juju.client.facade -s "juju/client/schemas*" -o juju/client/
2121

2222
.PHONY: run-unit-tests
23-
run-unit-tests: lint .tox
23+
run-unit-tests: .tox lint
2424
tox -e py3
2525

2626
.PHONY: run-integration-tests
27-
run-integration-tests: lint .tox
27+
run-integration-tests: .tox lint
2828
tox -e integration
2929

3030
.PHONY: run-all-tests

0 commit comments

Comments
 (0)