From 8896740bbe2af6244796cc46a873b70048c636a6 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 6 Apr 2022 12:56:51 +0200
Subject: [PATCH] Fix the CI

Lower constraints do not cap all dependencies, causing incompatibilities.
Update Jinja2 to 2.11.3 (the last pre-3.0 version) and downgrade
MarkupSafe, Werkzeug and itsdangerous for Flask.

Something must have changed in one of the dependencies, and the Location
header is no longer returning the host in the URL.

Remove subunit and testscenarios, we don't use them directly.

Change-Id: I5bad754ef7b1bec6986c2b4293a38226c5a261af
---
 lower-constraints.txt                        | 8 +++++---
 sushy_tools/tests/unit/emulator/test_main.py | 6 +++---
 test-requirements.txt                        | 2 --
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3d544c2e..d62faa93 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,14 +1,16 @@
-Flask==1.0.2
 coverage==4.0
+Flask==1.0.2
 ironic-lib==4.6.1
+itsdangerous==2.0.1
+Jinja2==2.11.3
 libvirt-python==6.0.0
+MarkupSafe==2.0.1
 munch==2.1.0
 openstacksdk==0.13.0
 oslotest==3.2.0
 pbr==2.0.0
-python-subunit==1.0.0
 requests==2.14.2
 stestr==1.0.0
 tenacity==6.2.0
-testscenarios==0.4
 testtools==2.2.0
+Werkzeug==2.0.3
diff --git a/sushy_tools/tests/unit/emulator/test_main.py b/sushy_tools/tests/unit/emulator/test_main.py
index 87715ca1..2a878635 100644
--- a/sushy_tools/tests/unit/emulator/test_main.py
+++ b/sushy_tools/tests/unit/emulator/test_main.py
@@ -671,9 +671,9 @@ class StorageTestCase(EmulatorTestCase):
                                  'Volumes', json=data)
 
         self.assertEqual(201, response.status_code)
-        self.assertEqual('http://localhost/redfish/v1/Systems/vmc-node/'
-                         'Storage/1/Volumes/13087010612',
-                         response.headers['Location'])
+        self.assertIn('/redfish/v1/Systems/vmc-node/'
+                      'Storage/1/Volumes/13087010612',
+                      response.headers['Location'])
 
     @patch_resource('volumes')
     def test_volume_resource_get(self, volumes_mock, systems_mock):
diff --git a/test-requirements.txt b/test-requirements.txt
index 8dd5470f..9c7d3019 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,11 +5,9 @@
 coverage!=4.4,>=4.0 # Apache-2.0
 # used by libvirt driver
 libvirt-python>=6.0.0 # LGPLv2+
-python-subunit>=1.0.0 # Apache-2.0/BSD
 # used by nova driver
 openstacksdk>=0.13.0  # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
-testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 munch>=2.1.0 # MIT