Skip to content

Commit 4e62224

Browse files
committed
fix tests
1 parent 018af56 commit 4e62224

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ bench:
77

88
test:
99
$(MAKE) -C tests
10-

tests/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
TEST_FLAGS ?=
1+
TEST_FLAGS ?=
22

33
GODEBUG ?=x509negativeserial=1
44

55
export GODEBUG
66

77
all: test-all
88

9-
test:
9+
venv:
10+
$(MAKE) -C ansible venv
11+
12+
test: venv
1013
go test \
1114
-failfast \
1215
-timeout 30m \

tests/ansible/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ PATH := $(VIRTUAL_ENV)/bin:$(PATH)
33
PYTHON_BIN ?= $(VIRTUAL_ENV)/bin/python
44
TARGET ?= none
55
REQUIREMENTS_FILE ?= requirements.txt
6+
ANSIBLE_CONFIG ?= $(shell pwd)/ansible.cfg
67

78
export PATH
89

910
.venv:
1011
python3 -m venv $(VIRTUAL_ENV)
1112

12-
venv: .venv
13+
venv: .venv pip-install
1314

1415
pip-freeze:
1516
$(PYTHON_BIN) -m pip freeze > $(REQUIREMENTS_FILE)
@@ -20,13 +21,11 @@ pip-install:
2021
server-up:
2122
ansible-playbook \
2223
-l "$(TARGET)" \
23-
-i inventory.yml \
2424
--tags up \
2525
-v playbook.yml
2626

2727
server-down:
2828
ansible-playbook \
2929
-l "$(TARGET)" \
30-
-i inventory.yml \
3130
--tags down \
3231
-v playbook.yml

tests/ansible/inventory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
all:
22
vars:
3-
ansible_python_interpreter: python3
43
ansible_connection: local
4+
ansible_python_interpreter: ./.venv/bin/python
55
docker_public_registry: mirror.gcr.io/
66
db_username: upper_db_user
77
db_password: upp3r//S3cr37

0 commit comments

Comments
 (0)