Merge lp:~ilowe/vmbuilder/unittest-coverage into lp:vmbuilder/trunk

[Iain Lowe]

[lp:~ilowe/vmbuilder/unittest-coverage]

342. By Iain Lowe on 2009-09-12

Added 'interface_implements' decorator to test suite

[Soren Hansen (soren)]

I don't think I see the purpose of the the interface_implements decorator.

a) You don't use it anywhere.
b) I don't understand why you do this as a decorator rather than a simple function?

I'm renaming a bunch of the unit test methods from e.g. test_parseSizeRoundsToNearestMB to test_rounds_size_to_nearest_megabyte as this is more in line with the rest of the project. Don't worry about this, I already have a patch ready for it.

Other than that, it looks really good. My experience with unit tests is rather limited, so I didn't know about these tools. Very handy indeed. Thanks!

review: Needs Information

[Soren Hansen (soren)]

I merged up until r341, deferring r342 until we've discussed the decorator thing.

[Iain Lowe (ilowe)]

I think something in the other branch must depend on the decorator;
IIRC there are a couple of "interface detecting" tests that I factored
out of somewhere. Don't worry about it, leave r342 and I'll just grab
the other branch and clean it up so they go in together. I think the
"why" of the decorator is clearer when paired with the code that uses
it (or at least I *hope* it is).

=== modified file '.bzrignore'
--- .bzrignore	2009-02-01 00:21:17 +0000
+++ .bzrignore	2009-09-12 18:27:38 +0000
@@ -1,3 +1,9 @@
 Doxyfile
 doc
 .bzrignore
+.coverage
+coverage-report
+VMBuilder.egg-info
+build
+stamp
+VMBuilder/vcsversion.py

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2009-09-12 18:28:24 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+test: clean stamp
+	@nosetests --verbose
+
+stamp:
+	@touch $@
+
+build:
+	@python setup.py bdist_egg sdist
+
+coverage:
+	@nosetests --quiet --with-coverage --cover-package VMBuilder
+
+report:
+	@nosetests --quiet --with-coverage --cover-package VMBuilder --cover-html --cover-html-dir coverage-report
+
+clean:
+	@rm -rf stamp .coverage coverage-report

=== added directory 'test'
=== renamed file 'tests.py' => 'test/__init__.py'
--- tests.py	2009-06-10 13:40:41 +0000
+++ test/__init__.py	2009-09-12 18:43:24 +0000
@@ -15,57 +15,3 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#    Tests, tests, tests, and more tests
-import unittest
-import VMBuilder.disk
-
-class TestSequenceFunctions(unittest.TestCase):
-    def test_parse_size(self):
-        self.assertEqual(VMBuilder.disk.parse_size(10), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10'), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10m'), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10M'), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10G'), 10240)
-        self.assertEqual(VMBuilder.disk.parse_size('10g'), 10240)
-        self.assertEqual(VMBuilder.disk.parse_size('10240K'), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10240k'), 10)
-        self.assertEqual(VMBuilder.disk.parse_size('10250K'), 10)
-
-    def test_index_to_devname(self):
-        self.assertEqual(VMBuilder.disk.index_to_devname(0), 'a')
-        self.assertEqual(VMBuilder.disk.index_to_devname(26), 'aa')
-        self.assertEqual(VMBuilder.disk.index_to_devname(18277), 'zzz')
-
-    def test_devname_to_index(self):
-        self.assertEqual(VMBuilder.disk.devname_to_index('a'), 0)
-        self.assertEqual(VMBuilder.disk.devname_to_index('b'), 1)
-        self.assertEqual(VMBuilder.disk.devname_to_index('aa'), 26)
-        self.assertEqual(VMBuilder.disk.devname_to_index('z'), 25)
-        self.assertEqual(VMBuilder.disk.devname_to_index('zz'), 701)
-        self.assertEqual(VMBuilder.disk.devname_to_index('zzz'), 18277)
-
-class TestUbuntuPlugin(unittest.TestCase):
-    def test_preflight_check_failed(self):
-        import VMBuilder
-        from VMBuilder.plugins.ubuntu.distro import Ubuntu
-        from VMBuilder.exception import VMBuilderUserError
-
-        vm = VMBuilder.VM()
-        vm.suite = 'foo'
-        ubuntu = Ubuntu(vm)
-        self.assertRaises(VMBuilderUserError, ubuntu.preflight_check)
-
-
-class TestUtils(unittest.TestCase):
-    def test_run_cmd(self):
-        import VMBuilder
-        from VMBuilder.util import run_cmd
-        self.assertTrue("foobarbaztest" in 
-                        run_cmd("env", env={'foobarbaztest' : 'bar' }))
-
-
-
-if __name__ == '__main__':
-    unittest.main()
-

=== added file 'test/log_tests.py'
--- test/log_tests.py	1970-01-01 00:00:00 +0000
+++ test/log_tests.py	2009-09-12 18:28:24 +0000
@@ -0,0 +1,19 @@
+import unittest
+
+from VMBuilder.log import console, set_verbosity
+import logging
+
+class LogTestSuite(unittest.TestCase):
+	def test_verbosityOptions(self):
+		'Using --debug, --verbose and --quiet flags set proper log levels'
+		
+		checks = [
+			('--debug', logging.DEBUG),
+			('--verbose', logging.INFO),
+			('--quiet', logging.CRITICAL),
+		]
+		
+		for opt, level in checks:
+			set_verbosity(None, opt, None, None)
+			self.assertEquals(level, console.level, 'Found wrong logging level after setting flag "%s"' % opt)
+

=== added file 'test/ubuntu_tests.py'
--- test/ubuntu_tests.py	1970-01-01 00:00:00 +0000
+++ test/ubuntu_tests.py	2009-09-12 18:28:24 +0000
@@ -0,0 +1,38 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2009 Canonical Ltd.
+#    
+#    See AUTHORS for list of contributors
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    Tests, tests, tests, and more tests
+
+import unittest
+
+import VMBuilder
+        
+from VMBuilder.plugins.ubuntu.distro import Ubuntu
+from VMBuilder.exception import VMBuilderUserError
+from VMBuilder.log import set_verbosity
+
+class TestUbuntuPlugin(unittest.TestCase):
+    def setUp(self):
+        set_verbosity(None, '--quiet', None, None)
+		
+    def test_invalidSuiteRaisesUserError(self):
+    	'Building Ubuntu VMs with an invalid suite raises UserError'
+        vm = VMBuilder.VM()
+        vm.suite = 'foo'
+        ubuntu = Ubuntu(vm)
+        self.assertRaises(VMBuilderUserError, ubuntu.preflight_check)

=== added file 'test/util_tests.py'
--- test/util_tests.py	1970-01-01 00:00:00 +0000
+++ test/util_tests.py	2009-09-12 19:01:53 +0000
@@ -0,0 +1,9 @@
+import unittest
+
+import VMBuilder
+from VMBuilder.util import run_cmd
+
+class TestUtils(unittest.TestCase):
+    def test_run_cmd(self):
+        self.assertTrue("foobarbaztest" in run_cmd("env", env={'foobarbaztest' : 'bar' }))
+