From 022a29e0cca655ae1c513fc96becc408f76d757b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 17 2017 09:03:49 +0000 Subject: [PATCH 1/2] Fix running the tests with a sqlite database where the ordering differs --- diff --git a/tests/test_pagure_lib_model.py b/tests/test_pagure_lib_model.py index 48e45eb..9099ead 100644 --- a/tests/test_pagure_lib_model.py +++ b/tests/test_pagure_lib_model.py @@ -232,9 +232,15 @@ class PagureLibModeltests(tests.Modeltests): # Check the ordering group = pagure.lib.search_groups(self.session, group_name='testgrp') + # Default PostgreSQL order + order = ['aaa', 'KKK', 'somenamespace/zzz'] + # Odd, SQLite order + if str(self.session.bind.engine.url).startswith('sqlite:'): + order = ['somenamespace/zzz', 'aaa', 'KKK'] + self.assertEqual( [p.fullname for p in group.projects], - ['aaa', 'KKK','somenamespace/zzz'] + order ) From 5e4fd127a39e87d9e9fe82e9ab7978b726bf9492 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 17 2017 09:03:49 +0000 Subject: [PATCH 2/2] Fix the tests, priorities are integers not text --- diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index 944899d..5902a0c 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -1211,7 +1211,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): user_id=1, # pingou uid='issue#2', private=False, - priority='high', + priority=1, ) self.session.add(issue) self.session.commit() @@ -1244,7 +1244,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # List all issues of the milestone v1.0 - output = self.app.get('/api/0/test/issues?priority=high') + output = self.app.get('/api/0/test/issues?priority=1') self.assertEqual(output.status_code, 200) data = json.loads(output.data) for idx in range(len(data['issues'])):