Skip to content

Commit

Permalink
Merge pull request #248 from gardar/molecule/pytest-update
Browse files Browse the repository at this point in the history
skip_changelog(ci): make sure pytest and pytest-testinfra versions stay compatible
  • Loading branch information
gardar authored Nov 17, 2023
2 parents 015193a + 437f561 commit fbf1aa6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
molecule
docker
pytest
pytest-testinfra
selinux
passlib
4 changes: 2 additions & 2 deletions tests/integration/molecule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ apt -y install docker.io

# Install test requirements from role
if [ -f "$role_root/test-requirements.txt" ]; then
python -m pip install -r "$role_root/test-requirements.txt"
python -m pip install --upgrade -r "$role_root/test-requirements.txt"
fi
# Install test requirements from collection
if [ -f "$collection_root/test-requirements.txt" ]; then
python -m pip install -r "$collection_root/test-requirements.txt"
python -m pip install --upgrade -r "$collection_root/test-requirements.txt"
fi

# Install ansible version specific requirements
Expand Down

0 comments on commit fbf1aa6

Please sign in to comment.