cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to e9fb906
Date Fri, 25 Apr 2014 12:44:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master bf188fc13 -> e9fb90659


CLOUDSTACK-6511: fixed for bvt and component test failures


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9fb9065
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9fb9065
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9fb9065

Branch: refs/heads/master
Commit: e9fb9065991a5063216f97f37082287b1b97a4e9
Parents: bf188fc
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Fri Apr 25 18:08:47 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Apr 25 18:13:47 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_nic.py     | 2 +-
 test/integration/smoke/test_vm_ha.py   | 6 +++---
 test/integration/smoke/test_volumes.py | 2 +-
 tools/marvin/marvin/codes.py           | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9fb9065/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index 5c72607..abfe443 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -124,7 +124,7 @@ class TestNic(cloudstackTestCase):
         except Exception as ex:
             self.debug("Exception during NIC test SETUP!: " + str(ex))
 
-    @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg", "provisioning"])
+    @attr(tags = ["devcloud",  "smoke", "basic", "sg", "provisioning"])
     def test_01_nic(self):
         #TODO: SIMENH: add validation
         """Test to add and update added nic to a virtual machine"""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9fb9065/test/integration/smoke/test_vm_ha.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_ha.py b/test/integration/smoke/test_vm_ha.py
index ae5b51f..197814d 100644
--- a/test/integration/smoke/test_vm_ha.py
+++ b/test/integration/smoke/test_vm_ha.py
@@ -25,13 +25,13 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 #Import Integration Libraries
 
 #base - contains all resources as entities and defines create, delete, list operations on
them
-from marvin.integration.lib.base import Account, VirtualMachine, Cluster, Host, ServiceOffering,
Configurations, SimulatorMock
+from marvin.lib.base import Account, VirtualMachine, Cluster, Host, ServiceOffering, Configurations,
SimulatorMock
 
 #utils - utility classes for common cleanup, external library wrappers etc
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 #common - commonly used methods for all tests are listed here
-from marvin.integration.lib.common import get_zone, get_domain, get_template
+from marvin.lib.common import get_zone, get_domain, get_template
 
 from nose.plugins.attrib import attr
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9fb9065/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index ecce6e3..7f5c4f3 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -51,7 +51,7 @@ class TestCreateVolume(cloudstackTestCase):
                                     cls.services["disk_offering"]
                                     )
         cls.sparse_disk_offering = DiskOffering.create(
-                                    cls.api_client,
+                                    cls.apiclient,
                                     cls.services["sparse_disk_offering"]
                                     )
         cls.custom_disk_offering = DiskOffering.create(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9fb9065/tools/marvin/marvin/codes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/codes.py b/tools/marvin/marvin/codes.py
index 4d44c58..28e907c 100644
--- a/tools/marvin/marvin/codes.py
+++ b/tools/marvin/marvin/codes.py
@@ -74,3 +74,5 @@ ADMIN = 1
 DOMAIN_ADMIN = 2
 USER = 0
 XEN_SERVER = "XenServer"
+ADMIN_ACCOUNT='ADMIN_ACCOUNT'
+USER_ACCOUNT='USER_ACCOUNT'


Mime
View raw message