openstack/nova
Code Issues Proposed changes

Make hacking test more accurate

Browse Source 
Hacking check returns tuple or None, assertTrue/assertFalse doesn't
handle the return results properly. For example, non-tuple return value
also can pass the hacking unit test method.

  * use assertEqual or assertIsInstance instead of assertTrue
  * use assertIsNone instead of assertFalse
  * remove duplicated test data in method test_virt_driver_imports

Change-Id: Iee8b466c3ab2c6437144367cdb874bd2f8839984
This commit is contained in:
ChangBo Guo(gcb)
2014-05-13 13:01:47 +08:00
committed by ChangBo Guo(gcb)
parent 112b4b1433
commit 960ddcceaf
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nova/tests/test_hacking.py
View File

@@ -47,31 +47,30 @@ class HackingTestCase(test.NoDBTestCase):
should pass.
"""
def test_virt_driver_imports(self):
self.assertTrue(checks.import_no_virt_driver_import_deps(
expect = (0, "N311: importing code from other virt drivers forbidden")
self.assertEqual(expect, checks.import_no_virt_driver_import_deps(
"from nova.virt.libvirt import utils as libvirt_utils",
"./nova/virt/xenapi/driver.py"))
self.assertEqual(expect, checks.import_no_virt_driver_import_deps(
"import nova.virt.libvirt.utils as libvirt_utils",
"./nova/virt/xenapi/driver.py"))
self.assertIsNone(checks.import_no_virt_driver_import_deps(
"from nova.virt.libvirt import utils as libvirt_utils",
"./nova/virt/libvirt/driver.py"))
self.assertTrue(checks.import_no_virt_driver_import_deps(
"import nova.virt.libvirt.utils as libvirt_utils",
"./nova/virt/xenapi/driver.py"))
self.assertTrue(checks.import_no_virt_driver_import_deps(
"import nova.virt.libvirt.utils as libvirt_utils",
"./nova/virt/xenapi/driver.py"))
self.assertIsNone(checks.import_no_virt_driver_import_deps(
"import nova.virt.firewall",
"./nova/virt/libvirt/firewall.py"))
def test_virt_driver_config_vars(self):
self.assertTrue(checks.import_no_virt_driver_config_deps(
self.assertIsInstance(checks.import_no_virt_driver_config_deps(
"CONF.import_opt('volume_drivers', "
"'nova.virt.libvirt.driver', group='libvirt')",
"./nova/virt/xenapi/driver.py"))
"./nova/virt/xenapi/driver.py"), tuple)
self.assertIsNone(checks.import_no_virt_driver_config_deps(
"CONF.import_opt('volume_drivers', "
@@ -79,12 +78,13 @@ class HackingTestCase(test.NoDBTestCase):
"./nova/virt/libvirt/volume.py"))
def test_no_author_tags(self):
self.assertTrue(checks.no_author_tags("# author: jogo"))
self.assertTrue(checks.no_author_tags("# @author: jogo"))
self.assertTrue(checks.no_author_tags("# @Author: jogo"))
self.assertTrue(checks.no_author_tags("# Author: jogo"))
self.assertTrue(checks.no_author_tags(".. moduleauthor:: jogo"))
self.assertFalse(checks.no_author_tags("# authorization of this"))
self.assertIsInstance(checks.no_author_tags("# author: jogo"), tuple)
self.assertIsInstance(checks.no_author_tags("# @author: jogo"), tuple)
self.assertIsInstance(checks.no_author_tags("# @Author: jogo"), tuple)
self.assertIsInstance(checks.no_author_tags("# Author: jogo"), tuple)
self.assertIsInstance(checks.no_author_tags(".. moduleauthor:: jogo"),
tuple)
self.assertIsNone(checks.no_author_tags("# authorization of this"))
self.assertEqual(2, checks.no_author_tags("# author: jogo")[0])
self.assertEqual(2, checks.no_author_tags("# Author: jogo")[0])
self.assertEqual(3, checks.no_author_tags(".. moduleauthor:: jogo")[0])