From 806f1c727cf78abef4f7f096c6d67b5dbd400315 Mon Sep 17 00:00:00 2001 From: Benjamin Blanc <benjamin.blanc@tiolive.com> Date: Mon, 29 Jul 2013 13:32:51 +0200 Subject: [PATCH] testnode: SlapOSMasterCommunicator: rename methods --- erp5/util/testnode/ScalabilityTestRunner.py | 2 +- erp5/util/testnode/SlapOSMasterCommunicator.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erp5/util/testnode/ScalabilityTestRunner.py b/erp5/util/testnode/ScalabilityTestRunner.py index b5f8e2d14d..cbe31b6d01 100644 --- a/erp5/util/testnode/ScalabilityTestRunner.py +++ b/erp5/util/testnode/ScalabilityTestRunner.py @@ -205,7 +205,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) """ self.log("Wait for instance state: %s" %state) start_time = time.time() - while (not self.slapos_communicator.isHostingSubscriptionCorrectly(instance_title, state) + while (not self.slapos_communicator.isHostingSubscriptionReady(instance_title, state) and (max_time > (time.time()-start_time))): time.sleep(15) if (time.time()-start_time) > max_time: diff --git a/erp5/util/testnode/SlapOSMasterCommunicator.py b/erp5/util/testnode/SlapOSMasterCommunicator.py index 135d08db4e..65a33c8af7 100644 --- a/erp5/util/testnode/SlapOSMasterCommunicator.py +++ b/erp5/util/testnode/SlapOSMasterCommunicator.py @@ -139,7 +139,7 @@ class SlapOSMasterCommunicator(object): return False return len(related_instance_link_list) > 0 - def isInstanceCorrectly(self, instance_link, status): + def isInstanceReady(self, instance_link, status): """ Return True if instance status and instance news text ~looks corresponding. ( use the matching of 'correctly' and 'Instance' and status ) @@ -148,14 +148,14 @@ class SlapOSMasterCommunicator(object): return ('Instance' in text) and ('correctly' in text) and (status in text) # check if provided 'status' = status - def isHostingSubscriptionCorrectly(self, hosting_subscription_title, status): + def isHostingSubscriptionReady(self, hosting_subscription_title, status): """ Return True if all instance status and instance news text ~looks corresponding. ( use the matching of 'correctly' and 'Instance' and status ). """ instance_link_list = self._getRelatedInstanceLink(hosting_subscription_title) for instance_link in instance_link_list: - if not self.isInstanceCorrectly(instance_link, status): + if not self.isInstanceReady(instance_link, status): return False return len(instance_link_list) > 0 -- 2.30.9