Avoid killing create_number.py
[functest.git] / functest / opnfv_tests / vnf / ims / clearwater.py
index 96f1b40..605ba8a 100644 (file)
@@ -46,9 +46,7 @@ class ClearwaterTesting(object):
 
         self.ellis_ip = ellis_ip
 
-    def availability_check_by_creating_numbers(self,
-                                               signup_code='secret',
-                                               two_numbers=False):
+    def availability_check(self, signup_code='secret', two_numbers=False):
         """Create one or two numbers"""
         assert self.ellis_ip
         output_dict = {}
@@ -85,7 +83,7 @@ class ClearwaterTesting(object):
         return output_dict
 
     def _create_ellis_account(self, account_url, params):
-        i = 50
+        i = 80
         for iloop in range(i):
             try:
                 req = requests.post(account_url, data=params)
@@ -100,7 +98,7 @@ class ClearwaterTesting(object):
             except Exception:  # pylint: disable=broad-except
                 self.logger.info(
                     "try %s: cannot create ellis account", iloop + 1)
-                time.sleep(25)
+                time.sleep(30)
         raise Exception(
             "Unable to create an account {}".format(
                 params.get('full_name')))
@@ -199,8 +197,8 @@ class ClearwaterTesting(object):
         vims_test_result = {}
         try:
             grp = re.search(
-                r'(\d+) failures out of (\d+) tests run.*'
-                r'(\d+) tests skipped', result, re.MULTILINE | re.DOTALL)
+                r'^(\d+) failures out of (\d+) tests run.*\n'
+                r'(\d+) tests skipped$', result, re.MULTILINE | re.DOTALL)
             assert grp
             vims_test_result["failures"] = int(grp.group(1))
             vims_test_result["total"] = int(grp.group(2))