From 51656a4f77a564370ea8e7073ebf3366ea335684 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 09 2016 16:57:41 +0000 Subject: Undo specifying a config file to run the tests and just bail on jenkins Basically, bail if there is no CI service enabled --- diff --git a/runtests.sh b/runtests.sh index 7be1368..eb8063b 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,3 +1,3 @@ #!/bin/bash -PAGURE_CONFIG=../tests/config PYTHONPATH=pagure ./nosetests --with-coverage --cover-erase --cover-package=pagure $* +PYTHONPATH=pagure ./nosetests --with-coverage --cover-erase --cover-package=pagure $* diff --git a/tests/config b/tests/config deleted file mode 100644 index d52090c..0000000 --- a/tests/config +++ /dev/null @@ -1 +0,0 @@ -PAGURE_CI_SERVICES = ['jenkins'] diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py index 2becf79..aebe7b7 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py @@ -110,6 +110,9 @@ class PagureFlaskPluginPagureCItests(tests.Modeltests): tests.create_projects_git(tests.HERE) + if APP.config.get('PAGURE_CI_SERVICES', None) is None: + return + # Activate hook output = self.app.post( '/test/settings/Pagure CI', data=data, follow_redirects=True)