Skip to content

Commit

Permalink
Docker: Update AiiDA test to pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Nov 6, 2019
1 parent abbbcaa commit dbebbfc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tools/docker/scripts/install_aiida.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rm -rf /var/lib/apt/lists/*
# install dependencies of aiida-cp2k
cd /opt/
git clone --quiet https://github.com/aiidateam/aiida-cp2k.git
pip3 install --quiet ./aiida-cp2k/[pre-commit,test]
pip3 install --quiet ./aiida-cp2k/[test]
pip3 uninstall --quiet --yes aiida-cp2k

# create ubuntu user with sudo powers
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/scripts/test_aiida.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
echo -e "\n========== Installing AiiDA-CP2K plugin =========="
cd /opt/aiida-cp2k/
git pull
pip3 install ./[pre-commit,test]
pip3 install ./[test]

echo -e "\n========== Configuring AiiDA =========="
AS_UBUNTU_USER="sudo -u ubuntu -H"
Expand Down Expand Up @@ -92,7 +92,7 @@ cd /opt/aiida-cp2k/
set +e # disable error trapping for remainder of script
(
set -e # abort on error
$AS_UBUNTU_USER ./run_tests.sh
$AS_UBUNTU_USER py.test
)

EXIT_CODE=$?
Expand Down

0 comments on commit dbebbfc

Please sign in to comment.