From 9a17c6870b1277dab74c3d41ff1e36d481795061 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Thu, 19 Feb 2015 17:23:22 +0200 Subject: [PATCH] Move setup logic for PlatformIO to py.test conf --- tests/conftest.py | 26 ++++++++++++++++++++++++++ tests/test_examples.py | 21 --------------------- 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 tests/conftest.py diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 00000000..facb9c97 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,26 @@ +# Copyright (C) Ivan Kravets +# See LICENSE for details. + +import pytest + +from platformio import app + + +@pytest.fixture(scope="module") +def platformio_setup(request): + prev_settings = dict( + enable_telemetry=None, + enable_prompts=None + ) + for key, value in prev_settings.iteritems(): + prev_settings[key] = app.get_setting(key) + # disable temporary + if prev_settings[key]: + app.set_setting(key, False) + + def platformio_teardown(): + # restore settings + for key, value in prev_settings.iteritems(): + app.set_setting(key, value) + + request.addfinalizer(platformio_teardown) diff --git a/tests/test_examples.py b/tests/test_examples.py index 180b89b4..89c5e500 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -7,30 +7,9 @@ from shutil import rmtree import pytest -from platformio import app from platformio.util import exec_command -@pytest.fixture(scope="module") -def platformio_setup(request): - prev_settings = dict( - enable_telemetry=None, - enable_prompts=None - ) - for key, value in prev_settings.iteritems(): - prev_settings[key] = app.get_setting(key) - # disable temporary - if prev_settings[key]: - app.set_setting(key, False) - - def platformio_teardown(): - # restore settings - for key, value in prev_settings.iteritems(): - app.set_setting(key, value) - - request.addfinalizer(platformio_teardown) - - def pytest_generate_tests(metafunc): if "pioproject_dir" not in metafunc.fixturenames: return