diff --git a/pagure/hooks/fedmsg.py b/pagure/hooks/fedmsg.py index f2fd681..7d192c8 100644 --- a/pagure/hooks/fedmsg.py +++ b/pagure/hooks/fedmsg.py @@ -19,7 +19,6 @@ from sqlalchemy.orm import backref from pagure.hooks import BaseHook from pagure.lib.model import BASE, Project -from pagure.utils import get_repo_path class FedmsgTable(BASE): diff --git a/pagure/hooks/files/rtd_hook.py b/pagure/hooks/files/rtd_hook.py index e4fab00..80a0f2d 100755 --- a/pagure/hooks/files/rtd_hook.py +++ b/pagure/hooks/files/rtd_hook.py @@ -78,22 +78,22 @@ def run_as_post_receive_hook(): refname = refname.replace('refs/heads/', '') if branches: if refname in branches: - print('Starting RTD build at %s' % (url) + print('Starting RTD build at %s' % (url)) requests.post( url, data={ 'branches': refname, - 'token'=repo.rtd_hook.api_token + 'token': repo.rtd_hook.api_token }, timeout=60, ) else: - print('Starting RTD build at %s' % (url) + print('Starting RTD build at %s' % (url)) requests.post( url, data={ 'branches': refname, - 'token'=repo.rtd_hook.api_token + 'token': repo.rtd_hook.api_token }, timeout=60, ) diff --git a/pagure/hooks/rtd.py b/pagure/hooks/rtd.py index 9a61115..8ab98eb 100644 --- a/pagure/hooks/rtd.py +++ b/pagure/hooks/rtd.py @@ -19,7 +19,7 @@ except ImportError: from sqlalchemy.orm import relation from sqlalchemy.orm import backref -from pagure.hooks import BaseHook, RequiredIf +from pagure.hooks import BaseHook from pagure.lib.model import BASE, Project from pagure.utils import get_repo_path diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py index 4c7130d..1e91b2d 100644 --- a/tests/test_pagure_flask_ui_plugins_fedmsg.py +++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py @@ -145,7 +145,7 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest): '' in output.data) - self.assertTrue(os.path.exists(os.path.join( + self.assertFalse(os.path.exists(os.path.join( self.path, 'repos', 'test.git', 'hooks', 'post-receive.fedmsg'))) self.assertTrue(os.path.exists(os.path.join( @@ -210,7 +210,7 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest): '/test/settings/Fedmsg', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue(os.path.exists(os.path.join( + self.assertFalse(os.path.exists(os.path.join( self.path, 'repos', 'test.git', 'hooks', 'post-receive.fedmsg'))) self.assertFalse(os.path.exists(os.path.join( diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 13b3912..b1ab9b8 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -2558,7 +2558,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(request.discussion), 0) self.assertEqual(len(request.comments), 1) self.assertEqual(request.score, 0) - self.assertEqual(mock_redis.publish.call_count, 3) + self.assertEqual(mock_redis.publish.call_count, 1) @patch('pagure.lib.REDIS') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))