Merge pull request #5705: Use python imports to identify fixtures (part 5/6)

Author: cognifloyd

CHANGELOG.rst

@@ -91,7 +91,7 @@ Changed
 * Move from udatetime to ciso8601 for date functionality ahead of supporting python3.9 #5692
   Contributed by Amanda McGuinness (@amanda11 intive)
 
-* Refactor tests to use python imports to identify test fixtures. #5699 #5702 #5703 #5704
+* Refactor tests to use python imports to identify test fixtures. #5699 #5702 #5703 #5704 #5705
   Contributed by @cognifloyd
 
 Removed

contrib/packs/tests/__init__.py

@@ -0,0 +1,16 @@
+# Copyright 2022 The StackStorm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+FIXTURES_DIR = os.path.dirname(os.path.abspath(__file__))

contrib/packs/tests/fixtures/__init__.py

@@ -37,7 +37,8 @@
 
 from pack_mgmt.download import DownloadGitRepoAction
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+# this import allows pants to detect that the fixtures are used in this file
+from .fixtures import FIXTURES_DIR
 
 PACK_INDEX = {
     "test": {
@@ -639,7 +640,7 @@ def test_run_pack_dowload_local_git_repo_detached_head_state(self):
             side_effect=TypeError("detached head")
         )
 
-        pack_path = os.path.join(BASE_DIR, "fixtures/stackstorm-test")
+        pack_path = os.path.join(FIXTURES_DIR, "stackstorm-test")
 
         result = action.run(
             packs=["file://%s" % (pack_path)], abs_repo_base=self.repo_base
@@ -665,7 +666,7 @@ def test_run_pack_download_local_directory(self):
         )
 
         # 2. Local pack which is not a git repository
-        pack_path = os.path.join(BASE_DIR, "fixtures/stackstorm-test4")
+        pack_path = os.path.join(FIXTURES_DIR, "stackstorm-test4")
 
         result = action.run(
             packs=["file://%s" % (pack_path)], abs_repo_base=self.repo_base

contrib/packs/tests/test_action_download.py

@@ -0,0 +1,16 @@
+# Copyright 2022 The StackStorm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import os
+
+FIXTURE_DIR = os.path.abspath(os.path.dirname(__file__))

st2common/tests/fixtures/__init__.py

@@ -41,6 +41,7 @@
 from st2common import log as logging
 from st2common.service_setup import setup as common_setup
 
+# Do not use helpers from st2tests to calculate this (avoid extra imports).
 FIXTURES_DIR = os.path.join(ST2TESTS_PATH, "st2tests/fixtures")
 ST2_CONFIG_DEBUG_LL_PATH = os.path.join(
     FIXTURES_DIR, "conf/st2.tests.api.debug_log_level.conf"

st2common/tests/fixtures/local_runner/__init__.py

@@ -25,11 +25,10 @@
 
 from st2common.transport import utils as transport_utils
 
-from st2tests.fixturesloader import get_fixtures_base_path
+from st2tests.fixtures.ssl_certs.fixture import FIXTURE_PATH as CERTS_FIXTURES_PATH
 
 __all__ = ["RabbitMQTLSListenerTestCase"]
 
-CERTS_FIXTURES_PATH = os.path.join(get_fixtures_base_path(), "ssl_certs/")
 ST2_CI = os.environ.get("ST2_CI", "false").lower() == "true"
 
 NON_SSL_LISTENER_PORT = 5672

st2common/tests/fixtures/local_runner/fixture.py

@@ -27,6 +27,7 @@
 # import this so that pants can infer dependencies for the glob below
 from st2tests.fixtures.packs.dummy_pack_1.fixture import PACK_PATH as DUMMY_PACK_1_PATH
 from st2tests.fixtures.packs.dummy_pack_4.fixture import PACK_PATH as DUMMY_PACK_4_PATH
+from st2tests.fixtures.packs.runners.fixture import FIXTURE_PATH as RUNNER_DIRS
 from st2tests.fixtures.packs_1.dummy_pack_4.fixture import PACK_PATH as EMPTY_PACK_PATH
 
 
@@ -49,7 +50,7 @@ def setUp(self):
 
     def test_register_from_pack_success(self):
         pack_dir = DUMMY_PACK_1_PATH
-        runner_dirs = os.path.join(get_fixtures_packs_base_path(), "runners")
+        runner_dirs = RUNNER_DIRS
 
         opts = [
             "--register-pack=%s" % (pack_dir),
@@ -63,7 +64,7 @@ def test_register_from_pack_success(self):
     def test_register_from_pack_fail_on_failure_pack_dir_doesnt_exist(self):
         # No fail on failure flag, should succeed
         pack_dir = "doesntexistblah"
-        runner_dirs = os.path.join(get_fixtures_packs_base_path(), "runners")
+        runner_dirs = RUNNER_DIRS
 
         opts = [
             "--register-pack=%s" % (pack_dir),
@@ -88,7 +89,7 @@ def test_register_from_pack_fail_on_failure_pack_dir_doesnt_exist(self):
     def test_register_from_pack_action_metadata_fails_validation(self):
         # No fail on failure flag, should succeed
         pack_dir = DUMMY_PACK_4_PATH
-        runner_dirs = os.path.join(get_fixtures_packs_base_path(), "runners")
+        runner_dirs = RUNNER_DIRS
 
         opts = [
             "--register-pack=%s" % (pack_dir),