Fix: Update default globbing pattern for collection matching

.github/workflows/tox.yml

@@ -47,7 +47,7 @@ jobs:
  matrix: ${{ fromJson(needs.pre.outputs.matrix) }}
 
  env:
- PYTEST_REQPASS: 453
+ PYTEST_REQPASS: 454
  environment: test
  steps:
  - uses: actions/checkout@v4

src/molecule/command/base.py

@@ -40,7 +40,7 @@
 from molecule.console import should_do_markup
 
 LOG = logging.getLogger(__name__)
-MOLECULE_GLOB = os.environ.get("MOLECULE_GLOB", "molecule/*/molecule.yml")
+MOLECULE_GLOB = os.environ.get("MOLECULE_GLOB", "**/molecule/*/molecule.yml")
 MOLECULE_DEFAULT_SCENARIO_NAME = "default"
 
 
@@ -94,7 +94,7 @@ def execute_cmdline_scenarios(scenario_name, args, command_args, ansible_args=()
  """
  glob_str = MOLECULE_GLOB
  if scenario_name:
- glob_str = glob_str.replace("*", scenario_name)
+ glob_str = glob_str.replace("/*/", f"/{scenario_name}/")
  scenarios = molecule.scenarios.Scenarios(
  get_configs(args, command_args, ansible_args, glob_str),
  scenario_name,

src/molecule/config.py

@@ -73,7 +73,7 @@ class Config(metaclass=NewInitCaller):
  """Config Class.
 
  Molecule searches the current directory for ``molecule.yml`` files by
- globbing `molecule/*/molecule.yml`. The files are instantiated into
+ globbing `**/molecule/*/molecule.yml`. The files are instantiated into
  a list of Molecule [molecule.config.Config][] objects, and each Molecule subcommand
  operates on this list.
 

test/a_unit/command/test_base.py

@@ -264,7 +264,7 @@ def test_verify_configs_raises_with_no_configs(caplog):
 
  assert e.value.code == 1
 
- msg = "'molecule/*/molecule.yml' glob failed. Exiting."
+ msg = "'**/molecule/*/molecule.yml' glob failed. Exiting."
  assert msg in caplog.text
 
 

test/b_functional/test_command.py

@@ -21,6 +21,7 @@
 
 import os
 import pathlib
+import shutil
 from test.b_functional.conftest import (
  idempotence,
  init_scenario,
@@ -330,14 +331,44 @@ def test_command_verify(scenario_to_test, with_scenario, scenario_name):
  verify(scenario_name)
 
 
-def test_sample_collection() -> None:
- assert (
- run_command(
- ["molecule", "test"],
- cwd="test/resources/sample-collection",
- ).returncode
- == 0
- )
+@pytest.mark.serial()
+@pytest.mark.parametrize(
+ ("scenario_name", "collection_name"),
+ [
+ pytest.param("default", "sample-collection"),
+ pytest.param("default", "sample-collection-nested"),
+ ],
+)
+def test_sample_collection(
+ resources_folder_path,
+ tmp_path,
+ scenario_name,
+ collection_name,
+):
+ collection_dir = tmp_path / "ansible_collections"
+ molecule_ephemeral_dir = tmp_path / "cache/molecule"
+ test_dir = tmp_path / f"{collection_name}"
+ verify_dir = pathlib.Path(f"{collection_dir}/acme/goodies/molecule")
+
+ shutil.copytree(f"{resources_folder_path}/sample-collection", test_dir)
+
+ if collection_name == "sample-collection-nested":
+ verify_dir = pathlib.Path(
+ f"{collection_dir}/acme/goodies/extensions/molecule",
+ )
+ # create collection with nested molecule directory
+ shutil.move(f"{test_dir}/molecule", f"{test_dir}/extensions/molecule")
+
+ cmd = [
+ f"ANSIBLE_COLLECTIONS_PATH={collection_dir}",
+ f"MOLECULE_EPHEMERAL_DIRECTORY={molecule_ephemeral_dir}",
+ "molecule",
+ "test",
+ "--scenario-name",
+ scenario_name,
+ ]
+ assert run_command(cmd, cwd=test_dir).returncode == 0
+ assert verify_dir.is_dir()
 
 
 @pytest.mark.parametrize(