From 9b253307a7973c51e2df05bfa0e288ea53b11698 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 29 Mar 2020 10:23:20 -0500
Subject: [PATCH] Remove some unneeded things from test-requirements

We don't need to depend directly on python-subunit.
In python3 we don't need safe_hasattr.
We don't use testrepository.

In lower constraints, os-client-config and mox3 are
transitive depends that we do not care about so don't
need to track lower pins for them.

futures and ipaddress were removed from requirements
but not from lc.

Finally, remove future from lc and from __future__
since we're python3 only.

Change-Id: Ic22079f78f77221e83986e5a835457dbefc3ded7
---
 examples/baremetal/provisioning.py         | 2 --
 lower-constraints.txt                      | 9 ---------
 openstack/tests/unit/config/base.py        | 3 +--
 openstack/tests/unit/config/test_config.py | 3 +--
 test-requirements.txt                      | 3 ---
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/examples/baremetal/provisioning.py b/examples/baremetal/provisioning.py
index 36ff49e13..7eb758051 100644
--- a/examples/baremetal/provisioning.py
+++ b/examples/baremetal/provisioning.py
@@ -14,8 +14,6 @@
 Operations with the provision state in the Bare Metal service.
 """
 
-from __future__ import print_function
-
 
 def manage_and_inspect_node(conn, uuid):
     node = conn.baremetal.find_node(uuid)
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 1f491875d..e86336cce 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -5,11 +5,7 @@ ddt==1.0.1
 decorator==4.4.1
 doc8==0.8.0
 dogpile.cache==0.6.5
-extras==1.0.0
 fixtures==3.0.0
-future==0.16.0
-futures==3.0.0
-ipaddress==1.0.17
 iso8601==0.1.11
 jmespath==0.9.0
 jsonpatch==1.16
@@ -18,10 +14,8 @@ jsonschema==2.6.0
 keystoneauth1==3.18.0
 linecache2==1.0.0
 mock==3.0.0
-mox3==0.20.0
 munch==2.1.0
 netifaces==0.10.4
-os-client-config==1.28.0
 os-service-types==1.7.0
 oslo.config==6.1.0
 oslotest==3.2.0
@@ -37,9 +31,6 @@ requestsexceptions==1.2.0
 six==1.10.0
 statsd==3.3.0
 stestr==1.0.0
-stevedore==1.20.0
-testrepository==0.0.18
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
-unittest2==1.1.0
diff --git a/openstack/tests/unit/config/base.py b/openstack/tests/unit/config/base.py
index 93dda054e..471cb5a6b 100644
--- a/openstack/tests/unit/config/base.py
+++ b/openstack/tests/unit/config/base.py
@@ -19,7 +19,6 @@ import copy
 import os
 import tempfile
 
-import extras
 import fixtures
 import yaml
 
@@ -226,7 +225,7 @@ class TestCase(base.TestCase):
 
     def _assert_cloud_details(self, cc):
         self.assertIsInstance(cc, cloud_region.CloudRegion)
-        self.assertTrue(extras.safe_hasattr(cc, 'auth'))
+        self.assertTrue(hasattr(cc, 'auth'))
         self.assertIsInstance(cc.auth, dict)
         self.assertIsNone(cc.cloud)
         self.assertIn('username', cc.auth)
diff --git a/openstack/tests/unit/config/test_config.py b/openstack/tests/unit/config/test_config.py
index a3d35ff68..e0fb827cc 100644
--- a/openstack/tests/unit/config/test_config.py
+++ b/openstack/tests/unit/config/test_config.py
@@ -16,7 +16,6 @@ import argparse
 import copy
 import os
 
-import extras
 import fixtures
 import testtools
 import yaml
@@ -765,7 +764,7 @@ class TestConfigArgparse(base.TestCase):
         # Not using assert_cloud_details because of cache settings which
         # are not present without the file
         self.assertIsInstance(cc, cloud_region.CloudRegion)
-        self.assertTrue(extras.safe_hasattr(cc, 'auth'))
+        self.assertTrue(hasattr(cc, 'auth'))
         self.assertIsInstance(cc.auth, dict)
         self.assertIsNone(cc.cloud)
         self.assertIn('username', cc.auth)
diff --git a/test-requirements.txt b/test-requirements.txt
index ad440b8cc..0544deede 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,18 +5,15 @@ hacking>=2.0,<2.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
-extras>=1.0.0 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
 jsonschema>=2.6.0 # MIT
 mock>=3.0.0 # BSD
 prometheus-client>=0.4.2 # Apache-2.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
 oslo.config>=6.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 statsd>=3.3.0
 stestr>=1.0.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 doc8>=0.8.0  # Apache-2.0