cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gua...@apache.org
Subject git commit: updated refs/heads/master to 48f3325
Date Thu, 16 Apr 2015 04:13:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 42a825399 -> 48f332582


CLOUDSTACK-8388: test_VirtualRouter_alerts.py - Fix wait time and pep8 issues

Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #173


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

Branch: refs/heads/master
Commit: 48f3325820037138043933055a75014313c1c188
Parents: 42a8253
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Apr 16 09:19:17 2015 +0530
Committer: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Committed: Thu Apr 16 09:42:43 2015 +0530

----------------------------------------------------------------------
 .../component/test_VirtualRouter_alerts.py           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f33258/test/integration/component/test_VirtualRouter_alerts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_VirtualRouter_alerts.py b/test/integration/component/test_VirtualRouter_alerts.py
index 5a3bbf0..bb3b129 100644
--- a/test/integration/component/test_VirtualRouter_alerts.py
+++ b/test/integration/component/test_VirtualRouter_alerts.py
@@ -187,23 +187,24 @@ class TestVRServiceFailureAlerting(cloudstackTestCase):
         self.debug("apache process status: %s" % res)
 
         configs = Configurations.list(
-                self.apiclient,
-                name='router.alerts.check.interval'
-            )
+            self.apiclient,
+            name='router.alerts.check.interval'
+        )
 
         # Set the value for one more minute than
         # actual range to be on safer side
         waitingPeriod = (
-                int(configs[0].value) + 600)  # in seconds
+            int(configs[0].value) + 60)  # in seconds
 
         time.sleep(waitingPeriod)
-        # wait for (router.alerts.check.interval + 10) minutes meanwhile monitor service
on
-        # VR starts the apache service (
+        # wait for (router.alerts.check.interval + 10) minutes meanwhile
+        # monitor service on VR starts the apache service (
         # router.alerts.check.interval default value is
         # 30minutes)
 
         qresultset = self.dbclient.execute(
-            "select id from alert where subject = '%s' ORDER BY id DESC LIMIT 1;" %
+            "select id from alert where subject \
+                    = '%s' ORDER BY id DESC LIMIT 1;" %
             str(alertSubject))
         self.assertNotEqual(
             len(qresultset),


Mime
View raw message