You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/04/30 10:28:23 UTC
[1/2] git commit: updated refs/heads/master to 6c9b219
Repository: cloudstack
Updated Branches:
refs/heads/master 94ab870d4 -> 6c9b21907
Fix few issues seen in run.
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf54f74f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf54f74f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf54f74f
Branch: refs/heads/master
Commit: bf54f74ffcc0ff267c809fcd57db97d3cfb5f399
Parents: 94ab870
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Apr 30 17:45:14 2014 +1000
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Wed Apr 30 13:56:34 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm_root_resize.py | 2 +-
tools/marvin/marvin/configGenerator.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf54f74f/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index e758ffd..8097d08 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -81,7 +81,7 @@ class TestDeployVM(cloudstackTestCase):
self.testdata["mode"] = self.zone.networktype
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
if self.template == FAILED:
- assert False, "get_template() failed to return template with description %s" % self.services["ostype"]
+ assert False, "get_template() failed to return template "
# for testing with specific template
# self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"], templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf54f74f/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 2a67bc1..4f03fd0 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -381,7 +381,7 @@ class ConfigManager(object):
config_dict = test_data
else:
configLines = []
- with open(file, 'r') as fp:
+ with open(self.__filePath, 'r') as fp:
for line in fp:
ws = line.strip()
if not ws.startswith("#"):
[2/2] git commit: updated refs/heads/master to 6c9b219
Posted by ta...@apache.org.
Added fix for CLOUDSTACK-6389
Added changes for CLOUDSTACK-6389.
More details in the bug.
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c9b2190
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c9b2190
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c9b2190
Branch: refs/heads/master
Commit: 6c9b21907c2600f320d2afc2fb7273fae73b7ba1
Parents: bf54f74
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Fri Apr 18 22:07:35 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Wed Apr 30 13:56:52 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_nic.py | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c9b2190/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index abfe443..e12bb33 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -33,8 +33,6 @@ class TestNic(cloudstackTestCase):
def setUp(self):
self.cleanup = []
- self.cleaning_up = 0
-
def signal_handler(signal, frame):
self.tearDown()
sys.exit(0)
@@ -52,9 +50,6 @@ class TestNic(cloudstackTestCase):
zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = zone.networktype
- if zone.networktype != 'Advanced':
- self.skipTest("Cannot run this test with a basic zone, please use advanced!")
-
#if local storage is enabled, alter the offerings to use localstorage
#this step is needed for devcloud
if zone.localstorageenabled == True:
@@ -265,14 +260,6 @@ class TestNic(cloudstackTestCase):
self.assertEqual(True, False, "Exception during NIC test!: " + str(ex))
def tearDown(self):
- if self.services['mode'] != 'Advanced':
- self.debug("Cannot run this test with a basic zone, please use advanced!")
- return
-
- if self.cleaning_up == 1:
- return
-
- self.cleaning_up = 1
try:
for obj in self.cleanup:
try:
@@ -280,8 +267,6 @@ class TestNic(cloudstackTestCase):
time.sleep(10)
except Exception as ex:
self.debug("Error deleting: " + str(obj) + ", exception: " + str(ex))
-
except Exception as e:
self.debug("Warning! Exception in tearDown: %s" % e)
- self.cleaning_up = 0