erp5.util.testnode: updating scalability tests

Some methods in the slapos master communicator no longer exist. The unit test for scalability was updated accordingly.

erp5/tests/testERP5TestNode.py

@@ -593,10 +593,6 @@ shared = true
 "launchable": False, "randomized_path" : "azertyuiop"})
     def patch_isMasterTestnode(self, *args, **kw):
       return (grade == 'master')
-    def patch_isHostingSubscriptionReady(self, *args, **kw):
-      return True
-    def patch_isRegisteredHostingSubscription(self, *args, **kw):
-      return True
     test_self = self
     test_result_path_root = os.path.join(test_self._temp_dir,'test/results')
     os.makedirs(test_result_path_root)
@@ -665,8 +661,6 @@ shared = true
       original_getSlaposHateoasUrl = TaskDistributor.getSlaposHateoasUrl
       original_isMasterTestnode = TaskDistributor.isMasterTestnode
       original_updateInstanceXML = RunnerClass._updateInstanceXML
-      original_isHostingSubscriptionReady = SlapOSMasterCommunicator.isHostingSubscriptionReady
-      original_isRegisteredHostingSubscription = SlapOSMasterCommunicator.isRegisteredHostingSubscription
       original_SlapOSMasterCommunicator__init__ = SlapOSMasterCommunicator.__init__
       TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
@@ -674,8 +668,6 @@ shared = true
       TaskDistributor.getSlaposHateoasUrl = patch_getSlaposHateoasUrl
       TaskDistributor.isMasterTestnode = patch_isMasterTestnode
       RunnerClass._updateInstanceXML = doNothing
-      SlapOSMasterCommunicator.isHostingSubscriptionReady = patch_isHostingSubscriptionReady
-      SlapOSMasterCommunicator.isRegisteredHostingSubscription = patch_isRegisteredHostingSubscription
       SlapOSMasterCommunicator.__init__ = doNothing
     original_generateConfiguration = TaskDistributor.generateConfiguration
     TaskDistributor.generateConfiguration = patch_generateConfiguration
@@ -708,8 +700,6 @@ shared = true
       TaskDistributor.getSlaposHateoasUrl = original_getSlaposHateoasUrl
       TaskDistributor.isMasterTestnode = original_isMasterTestnode
       RunnerClass._updateInstanceXML = original_updateInstanceXML
-      SlapOSMasterCommunicator.isHostingSubscriptionReady = original_isHostingSubscriptionReady
-      SlapOSMasterCommunicator.isRegisteredHostingSubscription = original_isRegisteredHostingSubscription
       SlapOSMasterCommunicator.__init__ = original_SlapOSMasterCommunicator__init__
     TaskDistributor.generateConfiguration = original_generateConfiguration
     TaskDistributor.startTestSuite = original_startTestSuite
@@ -777,10 +767,6 @@ shared = true
 "launchable": False, "randomized_path" : "azertyuiop"})
     def patch_isMasterTestnode(self, *args, **kw):
       return grade == 'master'
-    def patch_isHostingSubscriptionReady(self, *args, **kw):
-      return True
-    def patch_isRegisteredHostingSubscription(self, *args, **kw):
-      return True
     test_self = self
     test_result_path_root = os.path.join(test_self._temp_dir,'test/results')
     os.makedirs(test_result_path_root)
@@ -837,8 +823,6 @@ shared = true
       original_supply = SlapOSControler.supply
       original_request = SlapOSControler.request
       original_updateInstanceXML = RunnerClass._updateInstanceXML
-      original_isHostingSubscriptionReady = SlapOSMasterCommunicator.isHostingSubscriptionReady
-      original_isRegisteredHostingSubscription = SlapOSMasterCommunicator.isRegisteredHostingSubscription
       original_SlapOSMasterCommunicator__init__ = SlapOSMasterCommunicator.__init__
       TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
@@ -848,8 +832,6 @@ shared = true
       SlapOSControler.supply = doNothing
       SlapOSControler.request = doNothing
       RunnerClass._updateInstanceXML = doNothing
-      SlapOSMasterCommunicator.isHostingSubscriptionReady = patch_isHostingSubscriptionReady
-      SlapOSMasterCommunicator.isRegisteredHostingSubscription = patch_isRegisteredHostingSubscription
       SlapOSMasterCommunicator.__init__ = doNothing
     original_generateConfiguration = TaskDistributor.generateConfiguration
     original_startTestSuite = TaskDistributor.startTestSuite
@@ -888,8 +870,6 @@ shared = true
       SlapOSControler.supply =original_supply
       SlapOSControler.request = original_request
       SlapOSControler.updateInstanceXML = original_updateInstanceXML
-      SlapOSMasterCommunicator.isHostingSubscriptionReady = original_isHostingSubscriptionReady
-      SlapOSMasterCommunicator.isRegisteredHostingSubscription = original_isRegisteredHostingSubscription
       SlapOSMasterCommunicator.__init__ = original_SlapOSMasterCommunicator__init__
     TaskDistributor.generateConfiguration = original_generateConfiguration
     TaskDistributor.startTestSuite = original_startTestSuite
@@ -1050,10 +1030,6 @@ shared = true
       return "http://Foo"
     def patch_getTestType(self, *args, **kw):
       return "ScalabilityTest"
-    def patch_isHostingSubscriptionReady(self, *args, **kw):
-      return True
-    def patch_isRegisteredHostingSubscription(self, *args, **kw):
-      return True
     def patch_runTestSuite(self, *args, **kw):
       return {'status_code':0}
     test_self = self
@@ -1079,11 +1055,8 @@ shared = true
     original_supply = SlapOSControler.supply
     original_request = SlapOSControler.request
     original_updateInstanceXML = SlapOSControler.updateInstanceXML
-    original_isHostingSubscriptionReady = SlapOSMasterCommunicator.isHostingSubscriptionReady
-    original_isRegisteredHostingSubscription = SlapOSMasterCommunicator.isRegisteredHostingSubscription
     original_SlapOSMasterCommunicator__init__ = SlapOSMasterCommunicator.__init__
 
-    #
     time.sleep = doNothing
     TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
     TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
@@ -1100,8 +1073,6 @@ shared = true
     SlapOSControler.supply = doNothing
     SlapOSControler.request = doNothing
     SlapOSControler.updateInstanceXML = doNothing
-    SlapOSMasterCommunicator.isHostingSubscriptionReady = patch_isHostingSubscriptionReady
-    SlapOSMasterCommunicator.isRegisteredHostingSubscription = patch_isRegisteredHostingSubscription
     SlapOSMasterCommunicator.__init__ = doNothing
     # Run
     test_node = self.getTestNode()
@@ -1122,7 +1093,5 @@ shared = true
     SlapOSControler.supply = original_supply
     SlapOSControler.request = original_request
     SlapOSControler.updateInstanceXML = original_updateInstanceXML
-    SlapOSMasterCommunicator.isHostingSubscriptionReady = original_isHostingSubscriptionReady
-    SlapOSMasterCommunicator.isRegisteredHostingSubscription = original_isRegisteredHostingSubscription
     SlapOSMasterCommunicator.__init__ = original_SlapOSMasterCommunicator__init__
     time.sleep =original_sleep