Splits coverage testing from other tests

sudorandom · sudorandom · commit 585acb86b0b7 · 2014-11-13T11:35:11.000-06:00
Also uses unittest2 instead of testtools. unittest2 only works for
python 2 and causes the dependencies to be different between py2 and py3.
diff --git a/SoftLayer/testing/__init__.py b/SoftLayer/testing/__init__.py
@@ -7,10 +7,6 @@
 # Disable pylint import error and too many methods error
 # pylint: disable=F0401,R0904
 import logging
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
 import os.path
 
 import SoftLayer
@@ -19,6 +15,7 @@
 
 from click import testing
 import mock
+import testtools
 
 FIXTURE_PATH = os.path.abspath(os.path.join(__file__, '..', 'fixtures'))
 
@@ -74,7 +71,7 @@ def _mock_key(service, method):
     return '%s::%s' % (service, method)
 
 
-class TestCase(unittest.TestCase):
+class TestCase(testtools.TestCase):
     """Testcase class with PEP-8 compatable method names."""
 
     def set_up(self):
@@ -86,6 +83,7 @@ def tear_down(self):
         pass
 
     def setUp(self):  # NOQA
+        super(TestCase, self).setUp()
         self.env = environment.Environment()
 
         # Create a crazy mockable, fixture client
@@ -102,6 +100,7 @@ def setUp(self):  # NOQA
         return self.set_up()
 
     def tearDown(self):  # NOQA
+        super(TestCase, self).tearDown()
         return self.tear_down()
 
     def calls(self, service=None, method=None):
@@ -168,6 +167,3 @@ def call_has_props(call, props):
             return False
 
     return True
-
-
-__all__ = ['unittest']
diff --git a/SoftLayer/tests/CLI/core_tests.py b/SoftLayer/tests/CLI/core_tests.py
@@ -60,8 +60,7 @@ class CoreMainTests(testing.TestCase):
     def test_unexpected_error(self, stdoutmock, climock):
         climock.side_effect = AttributeError('Attribute foo does not exist')
 
-        with self.assertRaises(SystemExit):
-            core.main()
+        self.assertRaises(SystemExit, core.main)
 
         self.assertIn("Feel free to report this error as it is likely a bug",
                       stdoutmock.getvalue())
@@ -76,8 +75,7 @@ def test_sl_error(self, stdoutmock, climock):
         ex = SoftLayer.SoftLayerAPIError('SoftLayer_Exception', 'Not found')
         climock.side_effect = ex
 
-        with self.assertRaises(SystemExit):
-            core.main()
+        self.assertRaises(SystemExit, core.main)
 
         self.assertIn("SoftLayerAPIError(SoftLayer_Exception): Not found",
                       stdoutmock.getvalue())
@@ -89,8 +87,7 @@ def test_auth_error(self, stdoutmock, climock):
                                          'Invalid API token.')
         climock.side_effect = ex
 
-        with self.assertRaises(SystemExit):
-            core.main()
+        self.assertRaises(SystemExit, core.main)
 
         self.assertIn("Authentication Failed:", stdoutmock.getvalue())
         self.assertIn("use 'sl config setup'", stdoutmock.getvalue())
diff --git a/SoftLayer/tests/CLI/modules/dns_tests.py b/SoftLayer/tests/CLI/modules/dns_tests.py
@@ -218,6 +218,6 @@ def test_import_zone(self):
 
         self.assertEqual(len(calls), len(expected_calls))
         for call, expected_call in zip(calls, expected_calls):
-            self.assertDictEqual(call.args[0], expected_call)
+            self.assertEqual(call.args[0], expected_call)
 
         self.assertIn("Finished", result.output)
diff --git a/SoftLayer/tests/functional_tests.py b/SoftLayer/tests/functional_tests.py
@@ -11,21 +11,23 @@
 from SoftLayer import transports
 
 
-def get_creds():
-    for key in 'SL_USERNAME SL_API_KEY'.split():
-        if key not in os.environ:
-            raise testing.unittest.SkipTest(
-                'SL_USERNAME and SL_API_KEY environmental variables not set')
+class FunctionalTest(testing.TestCase):
+    def _get_creds(self):
+        for key in 'SL_USERNAME SL_API_KEY'.split():
+            if key not in os.environ:
+                raise self.skipTest('SL_USERNAME and SL_API_KEY environmental '
+                                    'variables not set')
 
-    return {
-        'endpoint': (os.environ.get('SL_API_ENDPOINT') or
-                     SoftLayer.API_PUBLIC_ENDPOINT),
-        'username': os.environ['SL_USERNAME'],
-        'api_key': os.environ['SL_API_KEY']
-    }
+        return {
+            'endpoint': (os.environ.get('SL_API_ENDPOINT') or
+                         SoftLayer.API_PUBLIC_ENDPOINT),
+            'username': os.environ['SL_USERNAME'],
+            'api_key': os.environ['SL_API_KEY']
+        }
 
 
-class UnauthedUser(testing.TestCase):
+class UnauthedUser(FunctionalTest):
+
     def test_failed_auth(self):
         client = SoftLayer.Client(
             username='doesnotexist', api_key='issurelywrong', timeout=20)
@@ -52,9 +54,9 @@ def test_no_hostname(self):
             self.fail('No Exception Raised')
 
 
-class AuthedUser(testing.TestCase):
+class AuthedUser(FunctionalTest):
     def test_service_does_not_exist(self):
-        creds = get_creds()
+        creds = self._get_creds()
         client = SoftLayer.Client(
             username=creds['username'],
             api_key=creds['api_key'],
@@ -71,7 +73,7 @@ def test_service_does_not_exist(self):
             self.fail('No Exception Raised')
 
     def test_get_users(self):
-        creds = get_creds()
+        creds = self._get_creds()
         client = SoftLayer.Client(
             username=creds['username'],
             api_key=creds['api_key'],
@@ -86,7 +88,7 @@ def test_get_users(self):
         self.assertTrue(found)
 
     def test_result_types(self):
-        creds = get_creds()
+        creds = self._get_creds()
         client = SoftLayer.Client(
             username=creds['username'],
             api_key=creds['api_key'],
diff --git a/SoftLayer/tests/managers/ordering_tests.py b/SoftLayer/tests/managers/ordering_tests.py
@@ -69,8 +69,9 @@ def test_get_package_id_by_type_fails_for_nonexistent_package_type(self):
         mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
         mock.return_value = []
 
-        with self.assertRaises(ValueError):
-            self.ordering.get_package_id_by_type("STRAWBERRY_FLAVORED_SERVERS")
+        self.assertRaises(ValueError,
+                          self.ordering.get_package_id_by_type,
+                          "STRAWBERRY_FLAVORED_SERVERS")
 
     def test_get_order_container(self):
         container = self.ordering.get_order_container(1234)
@@ -119,5 +120,6 @@ def test_generate_order_template(self):
                                   'quantity': 1})
 
     def test_generate_order_template_extra_quantity(self):
-        with self.assertRaises(ValueError):
-            self.ordering.generate_order_template(1234, [], quantity=1)
+        self.assertRaises(ValueError,
+                          self.ordering.generate_order_template,
+                          1234, [], quantity=1)
diff --git a/setup.cfg b/setup.cfg
@@ -1,11 +1,6 @@
 [nosetests]
 verbosity=1
 detailed-errors=1
-with-coverage=1
-cover-min-percentage=79
-cover-erase=true
-cover-package=SoftLayer
-cover-html=1
 
 [wheel]
 universal=1
diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt
@@ -3,3 +3,4 @@ nose
 mock
 coverage
 sphinx
+testtools
diff --git a/tox.ini b/tox.ini
@@ -1,23 +1,22 @@
 [tox]
-envlist = py26,py27,py33,py34,pypy,analysis
+envlist = py26,py27,py33,py34,pypy,analysis,coverage
 [testenv]
-deps =
-    unittest2
-    -r{toxinidir}/tools/test-requirements.txt
-commands = {envpython} setup.py nosetests []
-    
-
-[testenv:py33]
 deps = -r{toxinidir}/tools/test-requirements.txt
-commands = {envpython} setup.py nosetests []
+commands = nosetests
 
-[testenv:py34]
-deps = -r{toxinidir}/tools/test-requirements.txt
-commands = {envpython} setup.py nosetests []
+[testenv:coverage]
+basepython = python2.7
+commands = nosetests \
+                     --with-coverage \
+                     --cover-min-percentage=79 \
+                     --cover-erase \
+                     --cover-package=SoftLayer \
+                     --cover-html
 
 [testenv:analysis]
 basepython = python2.7
 deps =
+    -r{toxinidir}/tools/test-requirements.txt
     hacking
     pylint
 commands =
