You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/02/14 10:42:40 UTC
git commit: updated refs/heads/marvin to 38f4000
Updated Branches:
refs/heads/marvin 1eb98e135 -> 38f400010
CLOUDSTACk-5674: Fix missing import
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38f40001
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38f40001
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38f40001
Branch: refs/heads/marvin
Commit: 38f40001085c4518abf5ea7a4692aaed7ead45ba
Parents: 1eb98e1
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Feb 14 15:12:27 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Feb 14 15:12:27 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm_with_userdata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38f40001/test/integration/smoke/test_deploy_vm_with_userdata.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py
index bcef01a..c1410fb 100644
--- a/test/integration/smoke/test_deploy_vm_with_userdata.py
+++ b/test/integration/smoke/test_deploy_vm_with_userdata.py
@@ -22,7 +22,7 @@ from marvin.lib.base import (ServiceOffering,
from marvin.lib.common import get_template, get_zone, list_virtual_machines
from marvin.lib.utils import cleanup_resources
from nose.plugins.attrib import attr
-
+from marvin.codes import FAILED
import random
import string