diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 8f6c5059f..ead3a9912 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -11,4 +11,4 @@ jobs: python-version: 3.8 architecture: x64 - run: pip install flake8 - - run: flake8 --max-line-length 160 ./library/ ./tests/library/ + - run: flake8 --max-line-length 160 ./library/ ./tests/library/ ./tests/conftest.py ./tests/functional/tests/ diff --git a/tests/conftest.py b/tests/conftest.py index f7611397f..906376c11 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,6 +14,7 @@ def str_to_bool(val): else: raise ValueError("Invalid input value: %s" % val) + @pytest.fixture(scope="module") def setup(host): cluster_address = "" @@ -27,7 +28,6 @@ def setup(host): docker = ansible_vars.get("docker") osd_auto_discovery = ansible_vars.get("osd_auto_discovery") group_names = ansible_vars["group_names"] - fsid = ansible_vars.get("fsid") ansible_distribution = ansible_facts["ansible_facts"]["ansible_distribution"] @@ -84,6 +84,7 @@ def setup(host): return data + @pytest.fixture() def node(host, request): """ diff --git a/tests/functional/tests/test_install.py b/tests/functional/tests/test_install.py index 7e7c6de5d..69f38c41d 100644 --- a/tests/functional/tests/test_install.py +++ b/tests/functional/tests/test_install.py @@ -30,6 +30,7 @@ class TestCephConf(object): result = False assert result + class TestCephCrash(object): @pytest.mark.no_docker @pytest.mark.ceph_crash @@ -43,4 +44,4 @@ class TestCephCrash(object): def test_ceph_crash_service_enabled_and_running_container(self, node, host): s = host.service("ceph-crash@{hostname}".format(hostname=node["vars"]["inventory_hostname"])) assert s.is_enabled - assert s.is_running \ No newline at end of file + assert s.is_running