Drop testtools from test-requirements.txt

My understanding is that it was mainly being used so we could have sane
testing on py26.  With py26 support being dropped, we no longer need it.

Also drop discover from test-requirements.txt, as we don't seem to
actually use it.

Change-Id: Iee04c42890596d3b483c1473169480a3ae19aac8
Related-Change: I37116731db11449d0c374a6a83a3a43789a19d5f

test-requirements.txt

@@ -1,10 +1,8 @@
 hacking>=0.10.0,<0.11
 
 coverage>=3.6
-discover
 mock>=1.2
 oslosphinx
 python-keystoneclient>=0.7.0
 sphinx>=1.1.2,<1.2
 testrepository>=0.0.18
-testtools>=0.9.34

tests/functional/test_swiftclient.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import os
-import testtools
+import unittest
 import time
 from io import BytesIO
 
@@ -23,7 +23,7 @@
 import swiftclient
 
 
-class TestFunctional(testtools.TestCase):
+class TestFunctional(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
         super(TestFunctional, self).__init__(*args, **kwargs)

tests/unit/test_command_helpers.py

@@ -15,13 +15,13 @@
 
 import mock
 from six import StringIO
-import testtools
+import unittest
 
 from swiftclient import command_helpers as h
 from swiftclient.multithreading import OutputManager
 
 
-class TestStatHelpers(testtools.TestCase):
+class TestStatHelpers(unittest.TestCase):
 
     def setUp(self):
         super(TestStatHelpers, self).setUp()

tests/unit/test_multithreading.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-import testtools
+import unittest
 import threading
 import six
 
@@ -25,7 +25,7 @@
 from .utils import CaptureStream
 
 
-class ThreadTestCase(testtools.TestCase):
+class ThreadTestCase(unittest.TestCase):
     def setUp(self):
         super(ThreadTestCase, self).setUp()
         self.got_items = Queue()
@@ -163,7 +163,7 @@ def test_lazy_connections(self):
             )
 
 
-class TestOutputManager(testtools.TestCase):
+class TestOutputManager(unittest.TestCase):
 
     def test_instantiation(self):
         output_manager = mt.OutputManager()