cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 97ed8c3
Date Thu, 09 Jul 2015 10:26:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7c206c30a -> 97ed8c3af


Changes for Regression failures


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

Branch: refs/heads/master
Commit: 874445dae3408b551147871c1ca7ca8a1bebabed
Parents: 7c206c3
Author: pavan018 <pavanbandarupally@gmail.com>
Authored: Wed Jul 8 11:05:03 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Thu Jul 9 15:54:23 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_blocker_bugs.py   | 18 ++++++++++++++++--
 test/integration/component/test_project_limits.py |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/874445da/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index f6a032e..c229d38 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -663,7 +663,14 @@ class TestRouterRestart(cloudstackTestCase):
         #    all it's services should resume
 
         # Find router associated with user account
-        list_router_response = list_routers(
+        if (self.services['mode'] == "Basic"):
+            list_router_response = list_routers(
+                                    self.apiclient,
+                                    zoneid=self.zone.id,
+                                    listall=True
+                                    )
+        else:
+            list_router_response = list_routers(
                                     self.apiclient,
                                     account=self.account.name,
                                     domainid=self.account.domainid
@@ -702,7 +709,14 @@ class TestRouterRestart(cloudstackTestCase):
         self.apiclient.restartNetwork(cmd)
 
         # Get router details after restart
-        list_router_response = list_routers(
+        if (self.services['mode'] == "Basic"):
+            list_router_response = list_routers(
+                                    self.apiclient,
+                                    zoneid=self.zone.id,
+                                    listall=True
+                                    )
+        else:
+            list_router_response = list_routers(
                                     self.apiclient,
                                     account=self.account.name,
                                     domainid=self.account.domainid

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/874445da/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 848a896..ad4e75d 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -1052,7 +1052,7 @@ class TestMaxProjectNetworks(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "advancedns", "simulator",
-                "api", "eip"])
+                "api"])
     def test_maxAccountNetworks(self):
         """Test Limit number of guest account specific networks
         """


Mime
View raw message