Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit 2e0cce8ab0bab1c158065aef60fa502faddad7de Author: Valentin Gologuzov vgologuz@redhat.com Date: Thu Nov 6 15:55:29 2014 +0100
[backend, python-copr] fixed tests
backend/tests/test_createrepo.py | 4 ++-- cli/copr_cli/main.py | 13 +++++++------ test_suite.sh | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/backend/tests/test_createrepo.py b/backend/tests/test_createrepo.py index 40ec041..86e6fe1 100644 --- a/backend/tests/test_createrepo.py +++ b/backend/tests/test_createrepo.py @@ -25,7 +25,7 @@ else: from backend.createrepo import createrepo, createrepo_unsafe
@mock.patch('backend.createrepo.createrepo_unsafe') -@mock.patch('backend.createrepo.CoprClient') +@mock.patch('backend.helpers.CoprClient') def test_createrepo_conditional_true(mc_client, mc_create_unsafe): mc_client.return_value.get_project_details.return_value = MagicMock(data={"detail": {}})
@@ -42,7 +42,7 @@ def test_createrepo_conditional_true(mc_client, mc_create_unsafe): mc_create_unsafe.reset_mock()
@mock.patch('backend.createrepo.createrepo_unsafe') -@mock.patch('backend.createrepo.CoprClient') +@mock.patch('backend.helpers.CoprClient') def test_createrepo_conditional_false(mc_client, mc_create_unsafe): mc_client.return_value.get_project_details.return_value = MagicMock(data={"detail": {"auto_createrepo": False}})
diff --git a/cli/copr_cli/main.py b/cli/copr_cli/main.py index 3998fa3..7c2ac72 100644 --- a/cli/copr_cli/main.py +++ b/cli/copr_cli/main.py @@ -379,6 +379,12 @@ def main(argv=sys.argv[1:]): except KeyboardInterrupt: sys.stderr.write("\nInterrupted by user.") sys.exit(1) + except copr_exceptions.CoprBuildException as e: + sys.stderr.write("\nBuild error: {0}\n".format(e)) + sys.exit(4) + except copr_exceptions.CoprUnknownResponseException as e: + sys.stderr.write("\nError: {0}\n".format(e)) + sys.exit(5) except copr_exceptions.CoprRequestException as e: sys.stderr.write("\nSomething went wrong:") sys.stderr.write("\nError: {0}\n".format(e)) @@ -389,12 +395,7 @@ def main(argv=sys.argv[1:]): except copr_exceptions.CoprException as e: sys.stderr.write("\nError: {0}\n".format(e)) sys.exit(3) - except copr_exceptions.CoprBuildException as e: - sys.stderr.write("\nBuild error: {0}\n".format(e)) - sys.exit(4) - except copr_exceptions.CoprUnknownResponseException as e: - sys.stderr.write("\nError: {0}\n".format(e)) - sys.exit(5) + # except Exception as e: # print "Error: {0}".format(e) # sys.exit(100) diff --git a/test_suite.sh b/test_suite.sh index ab7468b..7089b21 100644 --- a/test_suite.sh +++ b/test_suite.sh @@ -23,6 +23,9 @@ pip install -r keygen/requirements.txt
mkdir -p _report
+python -m pytest python/copr/test --junitxml=_report/python-copr.junit.xml --cov-report xml --cov python/copr/client $@ +mv {,_report/python-copr.}coverage.xml + COPR_CONFIG="$(pwd)/frontend/coprs_frontend/config/copr_unit_test.conf" \ python -m pytest frontend/coprs_frontend/tests --junitxml=_report/frontend.junit.xml --cov-report xml --cov frontend/coprs_frontend/coprs $@ mv {,_report/frontend.}coverage.xml @@ -30,9 +33,6 @@ mv {,_report/frontend.}coverage.xml PYTHONPATH=backend/run:backend:python:$PYTHONPATH python -m pytest backend/tests --junitxml=_report/backend.junit.xml --cov-report xml --cov backend/backend $@ mv {,_report/backend.}coverage.xml
-python -m pytest python/copr/test --junitxml=_report/python-copr.junit.xml --cov-report xml --cov python/copr/client $@ -mv {,_report/python-copr.}coverage.xml - PYTHONPATH=python/:cli/:$PYTHONPATH python -m pytest cli/tests --junitxml=_report/cli.junit.xml --cov-report xml --cov cli/copr_cli $@ mv {,_report/cli.}coverage.xml
copr-commits@lists.fedorahosted.org