From a7a0817b795e25769c4d414530d99acc7f16d3ec Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 23 2021 15:52:33 +0000 Subject: [PATCH 1/2] Pin the pip version to upgrade on centos7 Signed-off-by: Pierre-Yves Chibon --- diff --git a/dev/containers/centos7-rpms-py2 b/dev/containers/centos7-rpms-py2 index a1e7858..f5594ad 100644 --- a/dev/containers/centos7-rpms-py2 +++ b/dev/containers/centos7-rpms-py2 @@ -32,7 +32,7 @@ RUN yum -y install \ # repoSpanner \ # repoSpanner-bridge -RUN pip install pip --upgrade +RUN pip install pip==20.3.4 --upgrade RUN pip install setuptools --upgrade RUN pip install pagure-messages From 2758bc6a7719d808530e64ab08287f7e23aecc67 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 24 2021 11:16:35 +0000 Subject: [PATCH 2/2] Fix getting the tests to run on CentOS7 Somehow in that environment querying in the tests for http://localhost/api/0/... does not work. Querying for /api/0... on the other hand works just fine. Signed-off-by: Pierre-Yves Chibon --- diff --git a/tests/test_pagure_flask_api_group.py b/tests/test_pagure_flask_api_group.py index b4d0cce..9e468e8 100644 --- a/tests/test_pagure_flask_api_group.py +++ b/tests/test_pagure_flask_api_group.py @@ -750,7 +750,7 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): headers = {"Authorization": "token aaabbbcccddd"} output = self.app.get( - "/api/0/group/some_group?projects=1&per_page=1", headers=headers + "/api/0/group/some_group?per_page=1&projects=1", headers=headers ) self.assertEqual(output.status_code, 200) @@ -760,7 +760,10 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): # Test the result we've got from the first page out of two assert projects == ["test"] - output_last = self.app.get(data["pagination"]["next"], headers=headers) + output_last = self.app.get( + data["pagination"]["next"].replace("http://localhost", ""), + headers=headers, + ) self.assertEqual(output_last.status_code, 200) data_last = json.loads(output_last.get_data(as_text=True))