From 59394da2fe1fb0122af291dd04503b6794060ef7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 09:44:34 +0000 Subject: [PATCH 1/11] Fix patching the SESSION and adjust the docstring on a couple of tests --- diff --git a/tests/test_progit_flask_ui_docs.py b/tests/test_progit_flask_ui_docs.py index e0893d2..def6b4a 100644 --- a/tests/test_progit_flask_ui_docs.py +++ b/tests/test_progit_flask_ui_docs.py @@ -39,6 +39,7 @@ class PagureFlaskDocstests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.docs.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( diff --git a/tests/test_progit_flask_ui_plugins.py b/tests/test_progit_flask_ui_plugins.py index 046a093..35ae16f 100644 --- a/tests/test_progit_flask_ui_plugins.py +++ b/tests/test_progit_flask_ui_plugins.py @@ -52,6 +52,7 @@ class PagureFlaskPluginstests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( diff --git a/tests/test_progit_flask_ui_plugins_irc.py b/tests/test_progit_flask_ui_plugins_irc.py index d5175c8..4a2f0b3 100644 --- a/tests/test_progit_flask_ui_plugins_irc.py +++ b/tests/test_progit_flask_ui_plugins_irc.py @@ -39,6 +39,7 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( @@ -50,7 +51,7 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): self.app = pagure.APP.test_client() def test_plugin_mail(self): - """ Test the mail plugin on/off endpoint. """ + """ Test the irc plugin on/off endpoint. """ tests.create_projects(self.session) diff --git a/tests/test_progit_flask_ui_plugins_mail.py b/tests/test_progit_flask_ui_plugins_mail.py index b9f5132..d22ee86 100644 --- a/tests/test_progit_flask_ui_plugins_mail.py +++ b/tests/test_progit_flask_ui_plugins_mail.py @@ -39,6 +39,7 @@ class PagureFlaskPluginMailtests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( diff --git a/tests/test_progit_flask_ui_plugins_progit_hook.py b/tests/test_progit_flask_ui_plugins_progit_hook.py index 107d82a..4d3ecd2 100644 --- a/tests/test_progit_flask_ui_plugins_progit_hook.py +++ b/tests/test_progit_flask_ui_plugins_progit_hook.py @@ -39,6 +39,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( @@ -52,7 +53,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): self.app = pagure.APP.test_client() def test_plugin_mail(self): - """ Test the mail plugin on/off endpoint. """ + """ Test the pagure hook plugin on/off endpoint. """ tests.create_projects(self.session) diff --git a/tests/test_progit_flask_ui_plugins_progit_request_hook.py b/tests/test_progit_flask_ui_plugins_progit_request_hook.py index a073fef..a8b8ab2 100644 --- a/tests/test_progit_flask_ui_plugins_progit_request_hook.py +++ b/tests/test_progit_flask_ui_plugins_progit_request_hook.py @@ -39,6 +39,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( From 2e9571c6fa339bfe9aad11d5e98a02fb8f906049 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 09:54:13 +0000 Subject: [PATCH 2/11] One more repo.SESSION to fix --- diff --git a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py index 1b47bd0..d3d1c1d 100644 --- a/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py +++ b/tests/test_progit_flask_ui_plugins_progit_ticket_hook.py @@ -39,6 +39,7 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( From f834f24b6a9d7fb75ca48c8a7dba777c56b183fb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 09:56:45 +0000 Subject: [PATCH 3/11] And again, adjust repo.SESSION and the docstring for the fedmsg hook tests --- diff --git a/tests/test_progit_flask_ui_plugins_fedmsg.py b/tests/test_progit_flask_ui_plugins_fedmsg.py index 02b7a58..ec35893 100644 --- a/tests/test_progit_flask_ui_plugins_fedmsg.py +++ b/tests/test_progit_flask_ui_plugins_fedmsg.py @@ -39,6 +39,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): pagure.ui.SESSION = self.session pagure.ui.app.SESSION = self.session pagure.ui.plugins.SESSION = self.session + pagure.ui.repo.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( @@ -50,7 +51,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): self.app = pagure.APP.test_client() def test_plugin_mail(self): - """ Test the mail plugin on/off endpoint. """ + """ Test the fedmsg plugin on/off endpoint. """ tests.create_projects(self.session) From 0fbda72c38000ae12a2d5c37165f575413e8c623 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 09:58:12 +0000 Subject: [PATCH 4/11] Add debugging code for jenkins --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index 6bbbf08..5b71502 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -946,6 +946,7 @@ class PagureFlaskIssuestests(tests.Modeltests): stream.close() self.assertEqual(output.status_code, 200) json_data = json.loads(output.data) + print output.data exp = { 'output': 'ok', 'filelocation': '/test/issue/raw/files/8a06845923010b27bfd8' From ceb367b16fe99199c1da2bf24ed32288a5761b09 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 14:53:38 +0000 Subject: [PATCH 5/11] Drop filename and filelocation specific to my dev environment to make them general --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index 5b71502..f4eb896 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -946,15 +946,16 @@ class PagureFlaskIssuestests(tests.Modeltests): stream.close() self.assertEqual(output.status_code, 200) json_data = json.loads(output.data) - print output.data + json_data['filename'] = json_data['filename'].split('pagure_')[1] + json_data['filelocation'] = '/test/issue/raw/files/'\ + '8a06845923010b27bfd8e7e75acff7badc40d1021b4994e01f5e11ca4'\ + '0bc3abe-' + json_data['filelocation'].split('pagure_')[1] exp = { 'output': 'ok', 'filelocation': '/test/issue/raw/files/8a06845923010b27bfd8' 'e7e75acff7badc40d1021b4994e01f5e11ca40bc3a' - 'be-home_pierrey_repos_gitrepo_pagure_tests' - '_placebo.png', - 'filename': 'home_pierrey_repos_gitrepo_pagure_tests_placebo' - '.png' + 'be-tests_placebo.png', + 'filename': 'tests_placebo.png' } self.assertDictEqual(json_data, exp) From 903c17bc204521706fa2e7c27e8da07e3fbb1541 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 15:06:59 +0000 Subject: [PATCH 6/11] Have the tests work on any environment while still being complete --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index f4eb896..e9fb29c 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -946,16 +946,14 @@ class PagureFlaskIssuestests(tests.Modeltests): stream.close() self.assertEqual(output.status_code, 200) json_data = json.loads(output.data) - json_data['filename'] = json_data['filename'].split('pagure_')[1] - json_data['filelocation'] = '/test/issue/raw/files/'\ - '8a06845923010b27bfd8e7e75acff7badc40d1021b4994e01f5e11ca4'\ - '0bc3abe-' + json_data['filelocation'].split('pagure_')[1] + + folder = os.getcwd()[1:].replace('/', '_') exp = { 'output': 'ok', 'filelocation': '/test/issue/raw/files/8a06845923010b27bfd8' 'e7e75acff7badc40d1021b4994e01f5e11ca40bc3a' - 'be-tests_placebo.png', - 'filename': 'tests_placebo.png' + 'be-%s_placebo.png' % folder, + 'filename': '%s_placebo.png' % folder, } self.assertDictEqual(json_data, exp) @@ -1022,8 +1020,7 @@ class PagureFlaskIssuestests(tests.Modeltests): url = '/issue/raw/files/8a06845923010b27bfd8'\ 'e7e75acff7badc40d1021b4994e01f5e11ca40bc3a'\ - 'be-home_pierrey_repos_gitrepo_pagure_tests'\ - '_placebo.png' + 'be-%s_placebo.png' % os.getcwd()[1:].replace('/', '_') output = self.app.get('/foo' + url) self.assertEqual(output.status_code, 404) From 91b4d6ad4687042e629cd6f8e3a3703b21e6c370 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 17:03:58 +0000 Subject: [PATCH 7/11] Set back the debugging statement --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index e9fb29c..f25e161 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -945,6 +945,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '/test/issue/1/upload', data=data, follow_redirects=True) stream.close() self.assertEqual(output.status_code, 200) + print output.data json_data = json.loads(output.data) folder = os.getcwd()[1:].replace('/', '_') From 4eb9bda1d0fec5c15a636c0be3d5dfc34f120d1a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 20:37:44 +0000 Subject: [PATCH 8/11] More debugging --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index f25e161..5517e3c 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -956,6 +956,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'be-%s_placebo.png' % folder, 'filename': '%s_placebo.png' % folder, } + print exp self.assertDictEqual(json_data, exp) # Project w/o issue tracker From be66224d8d0f667d3c9256808286e86467995c7e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 08 2015 20:49:20 +0000 Subject: [PATCH 9/11] Rework the way we find the correct folder --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index 5517e3c..2737c79 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -948,7 +948,8 @@ class PagureFlaskIssuestests(tests.Modeltests): print output.data json_data = json.loads(output.data) - folder = os.getcwd()[1:].replace('/', '_') + folder = os.path.dirname( + os.path.abspath(__file__))[1:].replace('/', '_') exp = { 'output': 'ok', 'filelocation': '/test/issue/raw/files/8a06845923010b27bfd8' @@ -1022,7 +1023,8 @@ class PagureFlaskIssuestests(tests.Modeltests): url = '/issue/raw/files/8a06845923010b27bfd8'\ 'e7e75acff7badc40d1021b4994e01f5e11ca40bc3a'\ - 'be-%s_placebo.png' % os.getcwd()[1:].replace('/', '_') + 'be-%s_placebo.png' % os.path.dirname( + os.path.abspath(__file__))[1:].replace('/', '_') output = self.app.get('/foo' + url) self.assertEqual(output.status_code, 404) From 52c8a42ed73fdc990253e35ae6be3c7537969a32 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 09 2015 09:42:39 +0000 Subject: [PATCH 10/11] There is only 1 project left: test2 so we can't rely on project test --- diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py index a67e79b..77d00c6 100644 --- a/tests/test_progit_flask_ui_repo.py +++ b/tests/test_progit_flask_ui_repo.py @@ -1404,12 +1404,17 @@ index 0000000..fb7093d self.assertTrue('

Projects (1)

' in output.data) self.assertTrue('

Forks (0)

' in output.data) + repo = pagure.lib.get_project(self.session, 'test') + self.assertEqual(repo, None) + repo = pagure.lib.get_project(self.session, 'test2') + self.assertNotEqual(repo, None) + # Add a fork of a fork item = pagure.lib.model.Project( user_id=1, # pingou name='test3', description='test project #3', - parent_id=1, + parent_id=2, hook_token='aaabbbjjj', ) self.session.add(item) From 1ac91bf7237be9bc75408c527178ea1c12de3054 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 09 2015 09:58:54 +0000 Subject: [PATCH 11/11] Remove debugging code --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index 2737c79..c0001ec 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -945,7 +945,6 @@ class PagureFlaskIssuestests(tests.Modeltests): '/test/issue/1/upload', data=data, follow_redirects=True) stream.close() self.assertEqual(output.status_code, 200) - print output.data json_data = json.loads(output.data) folder = os.path.dirname( @@ -957,7 +956,6 @@ class PagureFlaskIssuestests(tests.Modeltests): 'be-%s_placebo.png' % folder, 'filename': '%s_placebo.png' % folder, } - print exp self.assertDictEqual(json_data, exp) # Project w/o issue tracker