Skip to content

Commit

Permalink
Merge commit '7b8b775687cebb53a0915f41d7341df2dd1675eb' into feature/…
Browse files Browse the repository at this point in the history
…setup_tests

# Conflicts:
#	tests/cmr/concise/uat/C1240560262-GES_DISC
#	tests/cmr/concise/uat/C1240560263-GES_DISC
  • Loading branch information
James Wood authored and James Wood committed Apr 25, 2024
2 parents 085109d + 7b8b775 commit d22020f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def pytest_addoption(parser):

def pytest_generate_tests(metafunc):
if metafunc.config.option.regression:
cmr_dirpath = pathlib.Path('cmr')
cmr_dirpath = pathlib.Path('cmr/concise')

association_dir = 'uat' if metafunc.config.option.env == 'uat' else 'ops'
associations = os.listdir(cmr_dirpath.joinpath(association_dir))
Expand Down

0 comments on commit d22020f

Please sign in to comment.