TYPO

slapos/recipe/cloudoootestnode/testnode.py

@@ -94,11 +94,9 @@ def run(args):
     if profile_content is None:
       profile_content = """
 [buildout]
-extends = /home/slap/config/cloudooo.cfg
-"""
-#extends = %(software_config_path)s
-#""" %  {'software_config_path': os.path.join(repository_path,
-#                                          config['profile_path'])}
+extends = %(software_config_path)s
+""" %  {'software_config_path': os.path.join(repository_path,
+                                          config['profile_path'])}
     if not(buildout_section_id is None):
       profile_content += """\n
 [%(buildout_section_id)s]
@@ -107,6 +105,7 @@ branch = %(branch)s
 """ %  {'buildout_section_id': buildout_section_id,
         'repository_path' : repository_path,
         'branch' : vcs_repository.get('branch','cloudooo')}
+
   custom_profile = open(custom_profile_path, 'w')
   custom_profile.write(profile_content)
   custom_profile.close()
@@ -149,8 +148,9 @@ branch = %(branch)s
             continue
         retry_software = False
         previous_revision = revision
-        # Require build connection for runnig tests
+
         print config
+        # Require build connection for runnig tests
         portal_url = config['test_suite_master_url']
         test_result_path = None
         test_result = (test_result_path, revision)
@@ -216,21 +216,8 @@ branch = %(branch)s
           file_object = open(run_test_suite_path, 'r')
           line = file_object.readline()
           file_object.close()
-#          cloudooo_tests = glob(
-#                    '%s/*/src/cloudooo/cloudooo/handler/*/tests/test*.py' %
-#                    config['software_root'])
-#          for test in cloudooo_tests:
-          invocation_list = []
-          if line[:2] == '#!':
-            invocation_list = line[2:].split()
-          invocation_list.extend([run_test_suite_path,
-                                  '--paster_path', cloudooo_paster,
-                                  cloudooo_conf,
-                                  'testFfmpegServer'])
-          run_test_suite = subprocess.Popen(invocation_list)
-          process_group_pid_set.add(run_test_suite.pid)
-          run_test_suite.wait()
-          process_group_pid_set.remove(run_test_suite.pid)
+
+          wait_serve = True
           while wait_serve:
             try:
               conf = open(cloudooo_conf).read()
@@ -244,8 +231,11 @@ branch = %(branch)s
             except socket.error, e:
               wait_serve = True
               time.sleep(10)
+
+          cloudooo_tests = glob(
+                    '%s/*/src/cloudooo/cloudooo/handler/*/tests/test*.py' %
+                    config['software_root'])
           for test in cloudooo_tests:
-            print time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())
             invocation_list = []
             if line[:2] == '#!':
               invocation_list = line[2:].split()
@@ -253,6 +243,10 @@ branch = %(branch)s
                                     '--paster_path', cloudooo_paster,
                                     cloudooo_conf,
                                     test.split('/')[-1]])
+            run_test_suite = subprocess.Popen(invocation_list)
+            process_group_pid_set.add(run_test_suite.pid)
+            run_test_suite.wait()
+            process_group_pid_set.remove(run_test_suite.pid)
       except SubprocessError:
         time.sleep(120)
         continue