From 666966097ab26d02648f27d676dddba92dbac711 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Tue, 13 Oct 2020 14:42:02 -0400 Subject: [PATCH] Revert "Change to relative conftest.py imports" This reverts commit 2b53c74b1c174723e8c1efe58196ae53d3c66709. --- tests/test_cancellation.py | 2 +- tests/test_discovery.py | 2 +- tests/test_local.py | 2 +- tests/test_multi_program.py | 2 +- tests/test_spawning.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_cancellation.py b/tests/test_cancellation.py index aace021..45452b5 100644 --- a/tests/test_cancellation.py +++ b/tests/test_cancellation.py @@ -11,7 +11,7 @@ import pytest import trio import tractor -from .conftest import tractor_test, no_windows +from conftest import tractor_test, no_windows async def assert_err(delay=0): diff --git a/tests/test_discovery.py b/tests/test_discovery.py index 7f071e2..52a1dc8 100644 --- a/tests/test_discovery.py +++ b/tests/test_discovery.py @@ -11,7 +11,7 @@ import pytest import tractor import trio -from .conftest import tractor_test +from conftest import tractor_test @tractor_test diff --git a/tests/test_local.py b/tests/test_local.py index c6a3569..0a594d0 100644 --- a/tests/test_local.py +++ b/tests/test_local.py @@ -7,7 +7,7 @@ import pytest import trio import tractor -from .conftest import tractor_test +from conftest import tractor_test @pytest.mark.trio diff --git a/tests/test_multi_program.py b/tests/test_multi_program.py index 2d08f2f..12ca3ef 100644 --- a/tests/test_multi_program.py +++ b/tests/test_multi_program.py @@ -6,7 +6,7 @@ import time import pytest import tractor -from .conftest import ( +from conftest import ( tractor_test, sig_prog, _INT_SIGNAL, diff --git a/tests/test_spawning.py b/tests/test_spawning.py index 0800836..220af3e 100644 --- a/tests/test_spawning.py +++ b/tests/test_spawning.py @@ -5,7 +5,7 @@ import pytest import trio import tractor -from .conftest import tractor_test +from conftest import tractor_test statespace = {'doggy': 10, 'kitty': 4}