Merge "Replace assertEqual(None, *) with assertIsNone in tests"

This commit is contained in:
Jenkins 2014-02-18 13:50:16 +00:00 committed by Gerrit Code Review
commit 2236889121

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import unittest import testtools
from wsme import types as wtypes from wsme import types as wtypes
@ -20,7 +20,7 @@ from tuskar.api.controllers.v1 import models as api_models
from tuskar.db.sqlalchemy import models as db_models from tuskar.db.sqlalchemy import models as db_models
class BaseTests(unittest.TestCase): class BaseTests(testtools.TestCase):
def test_lookup(self): def test_lookup(self):
# Setup # Setup
@ -32,10 +32,10 @@ class BaseTests(unittest.TestCase):
# Test # Test
self.assertEqual(1, stub._lookup('a1')) self.assertEqual(1, stub._lookup('a1'))
self.assertEqual(None, stub._lookup('a2')) self.assertIsNone(stub._lookup('a2'))
class OvercloudModelTests(unittest.TestCase): class OvercloudModelTests(testtools.TestCase):
def test_from_db_model(self): def test_from_db_model(self):
# Setup # Setup