Merge "Suppress outputs in test_cli20_nsx_networkgateway"

neutronclient/tests/unit/test_cli20.py

@@ -20,9 +20,9 @@ import contextlib
 import cStringIO
 import fixtures
 from mox3 import mox
+from oslotest import base
 import requests
 import sys
-import testtools
 
 from neutronclient.common import constants
 from neutronclient.common import exceptions
@@ -156,7 +156,7 @@ class MyComparator(mox.Comparator):
         return str(self.lhs)
 
 
-class CLITestV20Base(testtools.TestCase):
+class CLITestV20Base(base.BaseTestCase):
 
     format = 'json'
     test_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

test-requirements.txt

@@ -5,6 +5,7 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mox3>=0.7.0
+oslotest
 python-subunit>=0.0.18
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18