From ac50252050949d8f73b96bc1c6be9b43b2c18d99 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 21 2018 10:21:06 +0000
Subject: [PATCH 1/5] Use the existing environment variables as a base for the workers


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/runtests.py b/runtests.py
index b54d261..f6d993f 100755
--- a/runtests.py
+++ b/runtests.py
@@ -249,13 +249,15 @@ class WorkerThread(threading.Thread):
                 cmd = [runner, "-v", "tests.%s" % self.suite]
                 if self.with_cover:
                     cmd.append("--with-cover")
-                env = {
+
+                env = os.environ.copy()
+                env.update({
                     "PAGURE_CONFIG": "../tests/test_config",
                     "COVERAGE_FILE": os.path.join(
                         self.results, "%s.coverage" % self.name
                     ),
                     "LANG": "en_US.UTF-8",
-                }
+                })
                 proc = subprocess.Popen(
                     cmd, cwd=".", stdout=resfile, stderr=subprocess.STDOUT, env=env
                 )

From f5f189edda570555ec974c2f112fb0d0c42c1129 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 21 2018 10:21:06 +0000
Subject: [PATCH 2/5] Install coverage outside of the venv


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/run_ci_tests.sh b/run_ci_tests.sh
index ce81f00..e2d3db2 100755
--- a/run_ci_tests.sh
+++ b/run_ci_tests.sh
@@ -35,7 +35,7 @@ fi
 # https://github.com/requests/requests/commit/991e8b76b7a9d21f698b24fa
 # and only in py3 we're having a version that is too old (2.1)
 pip3 install --upgrade "idna<2.8"
-pip install --upgrade tox trollius
+pip install --upgrade tox trollius coverage
 pip install --upgrade --force-reinstall chardet
 pip3 install "pygit2 <= `rpm -q libgit2 --queryformat='%{version}'`"
 tox --sitepackages -e 'py27-flask011-ci' -- --results=results-py2

From 7a5ac6e0e727e44181573afbc3760f33866a9eb7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 21 2018 13:11:58 +0000
Subject: [PATCH 3/5] Fix the tests on jenkins with older wtforms


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index 1fb07cd..7e814fd 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -103,15 +103,18 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest):
                 'Hook activated', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="mail_to" name="mail_to" '
-                    'required type="text" value=""></td>\n<td class="errors">'
-                    'This field is required.</td>', output_text)
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="mail_to" name="mail_to" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
+                    output_text)
             else:
                 self.assertIn(
                     '<div class="col-sm-10">\n        '
                     '<input class="form-control pl-0" id="mail_to" name="mail_to" '
                     'type="text" value="">\n    </div>\n  </div>\n      '
-                    '<div class="alert alert-danger">This field is required.</div>', output_text)
+                    '<div class="alert alert-danger">This field is required.</div>',
+                    output_text)
             self.assertIn(
                 '<input checked class="form-check-input mt-2" id="active" name="active" '
                 'type="checkbox" value="y">', output_text)
diff --git a/tests/test_pagure_flask_ui_plugins_mirror.py b/tests/test_pagure_flask_ui_plugins_mirror.py
index 3408011..eb781b8 100644
--- a/tests/test_pagure_flask_ui_plugins_mirror.py
+++ b/tests/test_pagure_flask_ui_plugins_mirror.py
@@ -126,16 +126,19 @@ class PagureFlaskPluginMirrortests(tests.Modeltests):
                 output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<td><input class="form-check-input mt-2" id="target" name="target" '
-                    'required type="text" value="https://host.org/target">'
-                    '</td>\n<td class="errors">Invalid input.</td>',
-                    output_text)
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="target" name="target" '
+                    'required type="text" value="https://host.org/target">\n'
+                    '    </div>\n  '
+                    '</div>\n      <div class="alert alert-danger">Invalid '
+                    'input.</div>', output_text)
             else:
                 self.assertIn(
                     '<div class="col-sm-10">\n        '
                     '<input class="form-control pl-0" id="target" name="target" '
                     'type="text" value="https://host.org/target">\n    </div>\n  '
-                    '</div>\n      <div class="alert alert-danger">Invalid input.</div>', output_text)
+                    '</div>\n      <div class="alert alert-danger">Invalid '
+                    'input.</div>', output_text)
 
             output = self.app.get('/test/settings/Mirroring', data=data)
             output_text = output.get_data(as_text=True)
diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py
index b6359e9..8de5a2c 100644
--- a/tests/test_pagure_flask_ui_plugins_noff.py
+++ b/tests/test_pagure_flask_ui_plugins_noff.py
@@ -44,8 +44,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -68,8 +68,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -102,8 +102,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -131,8 +131,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value=""></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -172,8 +172,8 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
-                    'required type="text" value="master"></td>', output_text)
+                    '<input class="form-control pl-0" id="branches" name="branches" '
+                    'required type="text" value="master">', output_text)
             else:
                 self.assertIn(
                     '<input class="form-control pl-0" id="branches" name="branches" '
@@ -208,7 +208,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest):
                 'Pagure</title>', output_text)
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<input class="form-check-input mt-2" id="branches" name="branches" '
+                    '<input class="form-control pl-0" id="branches" name="branches" '
                     'required type="text" value="">', output_text)
             else:
                 self.assertIn(
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index fedd795..1e7a98a 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -179,14 +179,16 @@ class PagureFlaskPluginPagureCItests(tests.SimplePagureTest):
 
             if self.get_wtforms_version() >= (2, 2):
                 self.assertIn(
-                    '<td><input class="form-control" id="ci_url" '
-                    'name="ci_url" required type="text" value="">'
-                    '</td>\n<td class="errors">This field is required.</td>',
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="ci_url" name="ci_url" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
                     output_text)
                 self.assertIn(
-                    '<td><input class="form-control" id="ci_job" '
-                    'name="ci_job" required type="text" value="">'
-                    '</td>\n<td class="errors">This field is required.</td>',
+                    '<div class="col-sm-10">\n        '
+                    '<input class="form-control pl-0" id="ci_job" name="ci_job" '
+                    'required type="text" value="">\n    </div>\n  </div>\n      '
+                    '<div class="alert alert-danger">This field is required.</div>',
                     output_text)
             else:
                 self.assertIn(

From 9cb1049b038cc197e6d01ce5244c67eba2c9fab6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 21 2018 13:11:58 +0000
Subject: [PATCH 4/5] Run unversioned python


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/hooks/files/hookrunner b/pagure/hooks/files/hookrunner
index 2a2b7ce..7b19abb 100755
--- a/pagure/hooks/files/hookrunner
+++ b/pagure/hooks/files/hookrunner
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/bin/env python
 # -*- coding: utf-8 -*-
 
 """

From e8280f291bb12bc7b7e318e4394265bc1a73e081 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 21 2018 13:26:12 +0000
Subject: [PATCH 5/5] Drop showing the first failure now that logs are properly synced out


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/run_ci_tests.sh b/run_ci_tests.sh
index e2d3db2..292af9d 100755
--- a/run_ci_tests.sh
+++ b/run_ci_tests.sh
@@ -40,9 +40,3 @@ pip install --upgrade --force-reinstall chardet
 pip3 install "pygit2 <= `rpm -q libgit2 --queryformat='%{version}'`"
 tox --sitepackages -e 'py27-flask011-ci' -- --results=results-py2
 tox --sitepackages -e 'py34-flask011-ci' -- --results=results-py3
-
-# Let's see if we can print the script this way
-sed -i -e "s|less|cat|" ./runtests.py
-python ./runtests.py list --show -n 1 --results=results-py3
-python ./runtests.py list --show -n 1 --results=results-py2
-