From 880f5e7a12afa73638d131569db0c3677135ad73 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mar 26 2019 19:43:24 +0000 Subject: Make sure that hooks are run during repoSpanner tests Signed-off-by: Patrick Uiterwijk --- diff --git a/tests/test_pagure_repospanner.py b/tests/test_pagure_repospanner.py index eadf6ef..a98e136 100644 --- a/tests/test_pagure_repospanner.py +++ b/tests/test_pagure_repospanner.py @@ -254,6 +254,11 @@ class PagureRepoSpannerTests(tests.Modeltests): self.tearDown() raise + # Upload the hook script to repoSpanner + args = munch.Munch({'region': 'default'}) + hookid = pagure.cli.admin.do_upload_repospanner_hooks(args) + pagure.config.config['REPOSPANNER_REGIONS']['default']['hook'] = hookid + def tearDown(self): """ Tear down the repoSpanner instance. """ if self.repospanner_proc: @@ -409,10 +414,6 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): ast.return_value = False pagure.cli.admin.session = self.session - # Upload the hook script to repoSpanner - args = munch.Munch({'region': 'default'}) - hookid = pagure.cli.admin.do_upload_repospanner_hooks(args) - user = tests.FakeUser(username='foo') with tests.user_set(self.app.application, user): data = { @@ -443,11 +444,6 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): output_text = output.get_data(as_text=True) self.assertEqual(output_text, '# project-1\n\nProject #1') - # Set the hook - args = munch.Munch({'hook': hookid}) - projects = pagure.cli.admin.do_ensure_project_hooks(args) - self.assertEqual(["project-1"], projects) - with tests.user_set(self.app.application, user): # Set editing Denied self.set_auth_status(False)