Merge "Remove some unneeded things from test-requirements"

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)

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

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)

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)

test-requirements.txt

@@ -5,18 +5,15 @@ hacking>=3.0,<3.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