Updated Branches: refs/heads/master-6-17-stable 111696859 -> bea03a3ff
Fix test_assign_vm to be discovered by nose testrunner the nosetests runner will not discover tests unless the tests start with the test_ prefix. When wrapping by the log_test_exceptions method the name of the method changes and is not test_ anymore causing the runner to skip the test. Included the __doc__ string as well so the runner can report results correctly. Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 2a51c3e2c9e7fd7d96afb9b9fee7199329bb7fdf) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bea03a3f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bea03a3f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bea03a3f Branch: refs/heads/master-6-17-stable Commit: bea03a3ff6a8e1ead769c4393f0ebe203609d14f Parents: 1116968 Author: Prasanna Santhanam <[email protected]> Authored: Sun Jun 30 12:50:32 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sun Jun 30 12:52:47 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_assign_vm.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bea03a3f/test/integration/component/test_assign_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_assign_vm.py b/test/integration/component/test_assign_vm.py index 1dc93a8..8bc98fe 100644 --- a/test/integration/component/test_assign_vm.py +++ b/test/integration/component/test_assign_vm.py @@ -40,13 +40,14 @@ from marvin.integration.lib.common import (get_domain, list_virtual_machines) def log_test_exceptions(func): - def _log_test_exceptions(self, *args, **kwargs): + def test_wrap_exception_log(self, *args, **kwargs): try: func(self, *args, **kwargs) except Exception as e: self.debug('Test %s Failed due to Exception=%s' % (func, e)) raise e - return _log_test_exceptions + test_wrap_exception_log.__doc__ = func.__doc__ + return test_wrap_exception_log class Services: """Test service data for:Change the ownershop of @@ -229,6 +230,7 @@ class TestVMOwnership(cloudstackTestCase): except Exception as e: self.debug("Warning! Exception in tearDown: %s" % e) + @attr(tags = ["advanced"]) @log_test_exceptions def test_01_move_across_different_domains(self):
