From 1253d22deec036085b3a8bf8fa215851d5324e44 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 13 Nov 2020 19:34:52 +0100 Subject: [PATCH] tests: Extract common changedir fixture Signed-off-by: Paul Barker Signed-off-by: Jan Kiszka --- tests/conftest.py | 31 +++++++++++++++++++++++++++++++ tests/test_patch.py | 8 -------- tests/test_refspec.py | 8 -------- 3 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 tests/conftest.py diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..0aef329 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,31 @@ +# kas - setup tool for bitbake based projects +# +# Copyright (c) Siemens AG, 2019 +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import os + +import pytest + + +@pytest.fixture +def changedir(): + yield + os.chdir(os.path.join(os.path.dirname(__file__), '..')) diff --git a/tests/test_patch.py b/tests/test_patch.py index 3f735a1..36449b0 100644 --- a/tests/test_patch.py +++ b/tests/test_patch.py @@ -25,14 +25,6 @@ import stat import shutil from kas import kas -import pytest - - -@pytest.fixture -def changedir(): - yield - os.chdir(os.path.join(os.path.dirname(__file__), '..')) - def test_patch(changedir, tmpdir): tdir = str(tmpdir.mkdir('test_patch')) diff --git a/tests/test_refspec.py b/tests/test_refspec.py index 56abd84..e8495d9 100644 --- a/tests/test_refspec.py +++ b/tests/test_refspec.py @@ -25,14 +25,6 @@ import shutil from kas import kas from kas.libkas import run_cmd -import pytest - - -@pytest.fixture -def changedir(): - yield - os.chdir(os.path.join(os.path.dirname(__file__), '..')) - def test_refspec_switch(changedir, tmpdir): """