Skip to content

Fix changes for Enable CentOS Stream 9 build #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cbouchar wants to merge 1 commit into from
Closed

Fix changes for Enable CentOS Stream 9 build #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Client/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

set -x

# Use Python 2 version if BKR_PY3 is not defined
if [[ -z ${BKR_PY3} ]]; then
pytest_command="py.test-2";
elif [[ ${BKR_PY3} == 1 ]]; then
pytest_command="pytest-3";
# if BKR_PY3 is present and defined use pytest-3
if [[ -z ${BKR_PY3} ]] || [[ ${BKR_PY3} != 1 ]]; then
test_command="nosetests ${*:--v --traverse-namespace bkr.client.tests}";
else
pytest_command="py.test-2";
test_command="pytest-3";
fi

env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \
$pytest_command
env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} ${test_command}
14 changes: 6 additions & 8 deletions Common/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

set -x

# Use Python 2 version if BKR_PY3 is not defined
if [[ -z ${BKR_PY3} ]]; then
pytest_command="py.test-2";
elif [[ ${BKR_PY3} == 1 ]]; then
pytest_command="pytest-3";
# if BKR_PY3 is not present and NOT python3
if [[ -z ${BKR_PY3} ]] || [[ ${BKR_PY3} != 1 ]]; then
test_command="nosetests ${*:--v bkr}";
else
pytest_command="py.test-2";
test_command="pytest-3";
fi

env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \
$pytest_command
env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} ${test_command}