Changeset 6992

Timestamp:

May 7, 2009, 12:03:54 PM (16 years ago)

Author:

rwilson

Message:

Fixed bug in utils get_hostname(), added top-level test: are we a cluster?

Location:

branches/numpy_misc/tools/acceptance_tests

Files:

• test_all.py (modified) (1 diff)
• test_utils.py (modified) (1 diff)

branches/numpy_misc/tools/acceptance_tests/test_all.py

@@ -31 +31 @@
         pass
 
+    # make sure we are running on a cluster machine
+    (hostname, _) = util.get_hostname()
+    cluster_info = util.get_cluster_info(hostname)
+    if cluster_info is None:
+        util.log_print_nl(logfile,
+                          'Sorry, you must be running on a cluster master node.')
+        util.log_print_nl(logfile, "You are on machine '%s'." % hostname)
+        sys.exit(10)
+
     # run the tests
     for test_module in Tests:

branches/numpy_misc/tools/acceptance_tests/test_utils.py

@@ -94 +94 @@
     try:
         result = hostname.strip().split('.', 1)
+        if len(result) < 2:
+            result.append('')
     except:
         result = (hostname, '')