You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/19 23:40:41 UTC
[1/2] git commit: updated refs/heads/master to 3efe053
Repository: cloudstack
Updated Branches:
refs/heads/master 6e068551d -> 3efe05395
Test would also throw success if vm was still 'Starting' after 1 minute, this resolves that Reduced for loop to two runs as it will make those many calls to the API if state was Running to start with
Signed-off-by: Daan Hoogland <da...@onecht.net>
This closes #493
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3efe0539
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3efe0539
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3efe0539
Branch: refs/heads/master
Commit: 3efe053952cee3ab878b0ab0c87af3bad2e5df4e
Parents: 480cd46
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 19 21:46:40 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 19 23:40:31 2015 +0200
----------------------------------------------------------------------
test/integration/smoke/test_secondary_storage.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3efe0539/test/integration/smoke/test_secondary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py
index 436e5a3..082c023 100644
--- a/test/integration/smoke/test_secondary_storage.py
+++ b/test/integration/smoke/test_secondary_storage.py
@@ -134,7 +134,7 @@ class TestSecStorageServices(cloudstackTestCase):
'Up',
"Check state of primary storage pools is Up or not"
)
- for _ in range(4):
+ for _ in range(2):
list_ssvm_response = list_ssvms(
self.apiclient,
systemvmtype='secondarystoragevm',
@@ -154,10 +154,10 @@ class TestSecStorageServices(cloudstackTestCase):
for ssvm in list_ssvm_response:
if ssvm.state == 'Starting':
- time.sleep(15)
+ time.sleep(30)
continue
- for ssvm in list_ssvm_response:
- self.assertEqual(
+ for ssvm in list_ssvm_response:
+ self.assertEqual(
ssvm.state,
'Running',
"Check whether state of SSVM is running"
[2/2] git commit: updated refs/heads/master to 3efe053
Posted by da...@apache.org.
Allow some time for the SSVM to start before throwing a failure
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/480cd469
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/480cd469
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/480cd469
Branch: refs/heads/master
Commit: 480cd4693fcb9969629e25a9dbe95da45a6ce1ab
Parents: 6e06855
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri Jun 19 21:06:51 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 19 23:40:31 2015 +0200
----------------------------------------------------------------------
test/integration/smoke/test_secondary_storage.py | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/480cd469/test/integration/smoke/test_secondary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py
index 1a24239..436e5a3 100644
--- a/test/integration/smoke/test_secondary_storage.py
+++ b/test/integration/smoke/test_secondary_storage.py
@@ -134,30 +134,35 @@ class TestSecStorageServices(cloudstackTestCase):
'Up',
"Check state of primary storage pools is Up or not"
)
-
- list_ssvm_response = list_ssvms(
+ for _ in range(4):
+ list_ssvm_response = list_ssvms(
self.apiclient,
systemvmtype='secondarystoragevm',
)
- self.assertEqual(
+ self.assertEqual(
isinstance(list_ssvm_response, list),
True,
"Check list response returns a valid list"
)
- #Verify SSVM response
- self.assertNotEqual(
+ #Verify SSVM response
+ self.assertNotEqual(
len(list_ssvm_response),
0,
"Check list System VMs response"
)
- for ssvm in list_ssvm_response:
- self.assertEqual(
+ for ssvm in list_ssvm_response:
+ if ssvm.state == 'Starting':
+ time.sleep(15)
+ continue
+ for ssvm in list_ssvm_response:
+ self.assertEqual(
ssvm.state,
'Running',
"Check whether state of SSVM is running"
)
+
return
@attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="false")