From 5a27cb7d1a2dca5cef0477ee426afa1bc19035ec Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 20 Apr 2016 15:45:57 +0100 Subject: [PATCH] Use assert(Not)Equal instead of assertTrue(A == X) Doing so gives richer error outputs. Change-Id: I9a789b46d5800baeb061840624f544239f650010 --- nova/tests/unit/api/openstack/test_api_version_request.py | 8 ++++---- nova/tests/unit/virt/image/test_model.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nova/tests/unit/api/openstack/test_api_version_request.py b/nova/tests/unit/api/openstack/test_api_version_request.py index 5a7e3fa2a851..33e7cc041911 100644 --- a/nova/tests/unit/api/openstack/test_api_version_request.py +++ b/nova/tests/unit/api/openstack/test_api_version_request.py @@ -88,10 +88,10 @@ class APIVersionRequestTests(test.NoDBTestCase): self.assertGreater(vers3, vers2) self.assertGreaterEqual(vers1, vers4) self.assertGreaterEqual(vers3, vers2) - self.assertTrue(vers1 != vers2) - self.assertTrue(vers1 == vers4) - self.assertTrue(vers1 != v_null) - self.assertTrue(v_null == v_null) + self.assertNotEqual(vers1, vers2) + self.assertEqual(vers1, vers4) + self.assertNotEqual(vers1, v_null) + self.assertEqual(v_null, v_null) self.assertRaises(TypeError, vers1.__lt__, "2.1") def test_version_matches(self): diff --git a/nova/tests/unit/virt/image/test_model.py b/nova/tests/unit/virt/image/test_model.py index e3281975a2e7..55b3e9e02fec 100644 --- a/nova/tests/unit/virt/image/test_model.py +++ b/nova/tests/unit/virt/image/test_model.py @@ -91,5 +91,5 @@ class ImageTest(test.NoDBTestCase): ["rbd.example.org"]) msg = str(img) - self.assertTrue(msg.find("braanes") == -1) - self.assertTrue(msg.find("***") != -1) + self.assertEqual(msg.find("braanes"), -1) + self.assertNotEqual(msg.find("***"), -1)