From c1b47430f334e9878308466031a194b86b0e349f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 27 2018 12:30:52 +0000 Subject: [PATCH 1/2] Ensure the tasks has finished before checking its results Signed-off-by: Pierre-Yves Chibon --- diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index 74bf72b..49d7915 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -16,6 +16,7 @@ import json import unittest import shutil import sys +import time import os import pygit2 @@ -1451,6 +1452,9 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertTrue(js_data['url'].startswith('/pv/task/')) output = self.app.get(js_data['url']) + while output.status_code == 418: + time.sleep(0.5) + output = self.app.get(js_data['url']) js_data2 = json.loads(output.data.decode('utf-8')) self.assertTrue(js_data2['results'][3] > 1509110062) js_data2['results'][3] = 1509110062 From 780acd6ffddf1befd271f88031f156d588e91021 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 27 2018 12:31:11 +0000 Subject: [PATCH 2/2] Fix tests for the change in the markdown processor Signed-off-by: Pierre-Yves Chibon --- diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 84e94b8..2a156bd 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -1679,8 +1679,8 @@ class PagureFlaskIssuestests(tests.Modeltests): # below self.assertIn( '

Metadata Update from '\ -' '\ -''' @pingou:
+ ''\ +'''@pingou:
- Issue close_status updated to: Fixed
- Issue status updated to: Closed (was: Open)

''', output.data) @@ -3505,8 +3505,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( '' - '

foo bar #1 see?

', output.data) + '

foo bar #1 see?

', output.data) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') @@ -3587,8 +3587,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( '' - '

foo bar #1 see?

', output.data) + '

foo bar #1 see?

', output.data) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email')