From 9946a851833dbbb19af66829eb732196a3d32dce Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 29 Jul 2020 13:29:49 -0700
Subject: [PATCH] Cap pytest to <6.0.0 to fix pytest-html

We get:

  INTERNALERROR> AttributeError: 'tuple' object has no attribute 'rsplit'

When running pytest-html and this appears related to the recent pytest
6.0.0 release. Cap pytest to <6.0.0 to fix this.

Change-Id: I1379267598099f3ab53c217f15c57f825b8889fa
---
 test-requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index a8d9df17ea..48b3294afa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,10 +9,12 @@ openstacksdk
 zuul-sphinx>=0.2.3
 testtools
 mock
+# pytest 6.0.0 breaks pytest-html
+pytest<6.0.0
+pytest-html # MPL-2.0
 # testinfra 1.17.0 has a broken wheel that won't install under python3
 # testinfra 3.0.0 switched the ansible backend, but broke ipv6 handling
 testinfra!=1.17.0,!=3.0.0
-pytest-html # MPL-2.0
 # testinfra's ansible backend actually requires paramiko, but it's not
 # specified.  After
 #  https://github.com/philpep/testinfra/pull/454