Skip to content
This repository was archived by the owner on Apr 15, 2024. It is now read-only.

Unittest fix #220

Merged
matusvalo merged 3 commits into from
Jul 12, 2018
+20 −14
Merged

Unittest fix #220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b3b16
Rename deprecated @pytest.yield_fixture to @pytest.fixture
matusvalo Jul 12, 2018
021cf24
Use /dev/null file instead of subprocess.PIPE
matusvalo Jul 12, 2018
271f545
Improved cleaning of consul after each test
matusvalo Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import time
import json
import os

import requests
import pytest
import py
Expand Down Expand Up @@ -78,8 +77,9 @@ def start_consul_instance(acl_master_token=None):
command = command.format(bin=bin).strip()
command = shlex.split(command)

p = subprocess.Popen(
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
with open('/dev/null', 'w') as devnull:
p = subprocess.Popen(
command, stdout=devnull, stderr=devnull)

# wait for consul instance to bootstrap
base_uri = 'http://127.0.0.1:%s/v1/' % ports['http']
Expand Down Expand Up @@ -108,34 +108,40 @@ def start_consul_instance(acl_master_token=None):
return p, ports['http']


@pytest.yield_fixture(scope="module")
def clean_consul(port):
# remove all data from the instance, to have a clean start
base_uri = 'http://127.0.0.1:%s/v1/' % port
requests.delete(base_uri + 'kv/', params={'recurse': 1})
services = requests.get(base_uri + 'agent/services').json().keys()
for s in services:
requests.put(base_uri + 'agent/service/deregister/%s' % s)


@pytest.fixture(scope="module")
def consul_instance():
p, port = start_consul_instance()
yield port
p.terminate()


@pytest.yield_fixture
@pytest.fixture
def consul_port(consul_instance):
yield consul_instance
# remove all data from the instance, to have a clean start
base_uri = 'http://127.0.0.1:%s/v1/' % consul_instance
requests.delete(base_uri + 'kv/?recurse=1')
port = consul_instance
yield port
clean_consul(port)


@pytest.yield_fixture(scope="module")
@pytest.fixture(scope="module")
def acl_consul_instance():
acl_master_token = uuid.uuid4().hex
p, port = start_consul_instance(acl_master_token=acl_master_token)
yield port, acl_master_token
p.terminate()


@pytest.yield_fixture
@pytest.fixture
def acl_consul(acl_consul_instance):
ACLConsul = collections.namedtuple('ACLConsul', ['port', 'token'])
port, token = acl_consul_instance
yield ACLConsul(port, token)
# remove all data from the instance, to have a clean start
base_uri = 'http://127.0.0.1:%s/v1/' % port
requests.delete(base_uri + 'kv/?recurse=1')
clean_consul(port)