Changeset 7659

Timestamp:

Mar 11, 2010, 12:05:09 PM (15 years ago)

Author:

gray

Message:

Using do_tests_checks_demos_audits from EQRM in cluster test_eqrm.py acceptance test. It now relies EQRM being in the pythonpath environment variable.

Location:

misc/tools/acceptance_tests

Files:

• test_all.py (modified) (2 diffs)
• test_eqrm.py (modified) (3 diffs)

misc/tools/acceptance_tests/test_all.py

@@ -9 +9 @@
 import test_utils as util
 
+# 'test_inter_latency.py' - not needed
 
 # the test files, in desired order
@@ -20 +21 @@
          'test_latency_bandwidth.py',
          'test_test_pypar.py',
-#         'test_inter_latency.py',
         ]
+
+Tests = ['test_eqrm.py']
 
 if __name__ == '__main__':

misc/tools/acceptance_tests/test_eqrm.py

@@ -6 +6 @@
 import time
 import test_utils as util
+from for_all_verification import do_tests_checks_demos_audits
 
 name = 'Running EQRM test_all.py'
 
 def test(logfile):
+    """
+   
+    """
     result = True
 
@@ -17 +21 @@
     python_env_var = os.getenv('PYTHON')
 
-    # remember the directory we are in and go to EQRM test directory
+    # remember the directory we are in and go to EQRM directory
     home_directory = os.getcwd()
     eqrm_path = os.getenv('EQRMPATH')
@@ -24 +28 @@
                                    "can't test EQRM.")
         return False
+    
+    result = do_tests_checks_demos_audits(eqrm_root_dir=eqrm_path,
+                                          python_command=python_env_var)
 
-    os.chdir(os.path.join(eqrm_path))
-    print 'in %s' % os.getcwd()
+#     os.chdir(os.path.join(eqrm_path))
+#     print 'in %s' % os.getcwd()
 
-    # run clean_all.py
-    util.log_print_nl(logfile, '%s clean_all.py' % python_env_var)
-    (fd_in, fd_out) = os.popen4('%s clean_all.py' % python_env_var)
-    fd_in.write('y\n')
-    fd_in.close()
-    clean_result = fd_out.read()
-    fd_out.close()
-    util.log_print(logfile, clean_result)
+#     # run clean_all.py
+#     util.log_print_nl(logfile, '%s clean_all.py' % python_env_var)
+#     (fd_in, fd_out) = os.popen4('%s clean_all.py' % python_env_var)
+#     fd_in.write('y\n')
+#     fd_in.close()
+#     clean_result = fd_out.read()
+#     fd_out.close()
+#     util.log_print(logfile, clean_result)
 
-    # run test_all.py
-    util.log_print_nl(logfile, '%s test_all.py' % python_env_var)
-    (_, fd_out) = os.popen4('%s test_all.py' % python_env_var)
-    test_result = fd_out.read()
-    status = fd_out.close()
-    util.log_print(logfile, test_result)
+#     # run test_all.py
+#     util.log_print_nl(logfile, '%s test_all.py' % python_env_var)
+#     (_, fd_out) = os.popen4('%s test_all.py' % python_env_var)
+#     test_result = fd_out.read()
+#     status = fd_out.close()
+#     util.log_print(logfile, test_result)
 
-    # run check_scenarios.py
-    util.log_print_nl(logfile, '%s check_scenarios.py' % python_env_var)
-    (_, fd_out) = os.popen4('%s check_scenarios.py' % python_env_var)
-    test_result = fd_out.read()
-    status = fd_out.close()
-    util.log_print(logfile, test_result)
+#     # run check_scenarios.py
+#     util.log_print_nl(logfile, '%s check_scenarios.py' % python_env_var)
+#     (_, fd_out) = os.popen4('%s check_scenarios.py' % python_env_var)
+#     test_result = fd_out.read()
+#     status = fd_out.close()
+#     util.log_print(logfile, test_result)
 
-    # return to original directory
-    os.chdir(home_directory)
+#     # return to original directory
+#     os.chdir(home_directory)
 
     return result