Set correct default directory for tests (#2732)

ansible · Jul 7, 2020 · 3437e45 · 3437e45
1 parent a485021
commit 3437e45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/molecule/test/unit/verifier/test_ansible.py b/molecule/test/unit/verifier/test_ansible.py
@@ -57,8 +57,8 @@ def test_enabled_property(_instance):
 
 def test_directory_property(_instance):
     parts = _instance.directory.split(os.path.sep)
-    # default verifier is ansible, which keeps tests in molecule folder.
-    assert "molecule" == parts[-1]
+    # Unused by Ansible verifier
+    assert ["molecule", "default", "tests"] == parts[-3:]
 
 
 @pytest.mark.parametrize("config_instance", ["_verifier_section_data"], indirect=True)

diff --git a/molecule/verifier/base.py b/molecule/verifier/base.py
@@ -94,7 +94,7 @@ def enabled(self):
     def directory(self):
         return os.path.join(
             self._config.scenario.directory,
-            self._config.config["verifier"].get("directory", "molecule"),
+            self._config.config["verifier"].get("directory", "tests"),
         )
 
     @property

diff --git a/molecule/verifier/testinfra.py b/molecule/verifier/testinfra.py
@@ -119,13 +119,6 @@ def default_options(self):
 
         return d
 
-    @property
-    def directory(self):
-        return os.path.join(
-            self._config.scenario.directory,
-            self._config.config["verifier"].get("directory", "tests"),
-        )
-
     # NOTE(retr0h): Override the base classes' options() to handle
     # ``ansible-galaxy`` one-off.
     @property