Skip to content

Commit f8e0f33

Browse files
committed
improve unit test pathing for pytest
1 parent aa3bc70 commit f8e0f33

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
steps:
1111
- checkout
1212
- run:
13-
name: install prereqs and setup fake pytest
14-
command: apk add --no-cache --update make && cp fixtures/py.test /usr/local/bin/py.test
13+
name: install prereqs
14+
command: apk add --no-cache --update make
1515
- run:
1616
name: build
1717
command: make build
1818
- run:
1919
name: unit test with fake py.test
20-
command: PATH="${PATH}:/usr/local/bin" make unit
20+
command: make unit
2121

2222
workflows:
2323
execute_tests:

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
steps:
2121
- name: checkout
2222
uses: actions/checkout@v4
23-
- name: install prereqs and setup fake pytest
24-
run: apk add --no-cache --update make && cp fixtures/py.test /usr/local/bin/py.test
23+
- name: install prereqs
24+
run: apk add --no-cache --update make
2525
- name: build
2626
run: make build
2727
- name: unit test with fake py.test
28-
run: PATH="${PATH}:/usr/local/bin" make unit
28+
run: make unit

provisioner/testinfra_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var basicConfig = &Config{
2323
Local: false,
2424
Marker: "fast",
2525
Parallel: true,
26-
PytestPath: "/usr/local/bin/py.test",
26+
PytestPath: "../fixtures/py.test",
2727
Sudo: true,
2828
SudoUser: "fooman",
2929
DestinationDir: "/tmp",

0 commit comments

Comments
 (0)