Changeset 3354 for palm/trunk/SCRIPTS/palmtest

Timestamp:

Oct 15, 2018 8:38:37 PM (6 years ago)

Author:

knoop

Message:

Improvements to palmtest and reduction of netcdf file check precission for profiles

File:

• palm/trunk/SCRIPTS/palmtest (modified) (10 diffs)

palm/trunk/SCRIPTS/palmtest

@@ -66 +66 @@
 
 try:
-    from termcolor import colored
+    from termcolor import colored as tcolored
 except ImportError:
-    def colored(string, color):
+    def tcolored(string, color):
         return string
 
-
-version = '1.0.0'
+disable_colored_output = False
+
+
+def colored(string, color):
+    if not disable_colored_output:
+        return tcolored(string, color)
+    else:
+        return string
+
+
+version = '1.0.1'
 
 scripts_dir = os.path.dirname(os.path.realpath(__file__))
@@ -88 +97 @@
 hline = '#' * min(terminal_columns, 300) + '\n'
 table_width_intro = 12
-table_width_builds = len(max([s for s in next(os.walk(trunk_tests_builds_dir))[1]], key=len)) + len('_debug')
-table_width_cases = len(max([s for s in next(os.walk(trunk_tests_cases_dir))[1]], key=len))
+table_width_builds = len(max([s for s in next(os.walk(trunk_tests_builds_dir))[1] if not s[0] == '.'], key=len)) + len('_debug')
+table_width_cases = len(max([s for s in next(os.walk(trunk_tests_cases_dir))[1] if not s[0] == '.'], key=len))
 table_width_cores = 7
 table_width_total = table_width_intro + table_width_builds + table_width_cases + table_width_cores + 3
@@ -954 +963 @@
         self.fail_on_debug = args.fail_on_debug
         self.dry_run = args.dry_run
+        self.no_color = args.no_color
         self.test_id = args.test_id
         self.test_case_names = args.cases
@@ -962 +972 @@
 
     def prepare(self):
+        global disable_colored_output
+        disable_colored_output = self.no_color
         self.test_dir = os.path.join(tests_dir, self.test_id)
         try:
@@ -1001 +1013 @@
 
             if 'all' in self.requested_build_names:
-                self.requested_build_names = [name for name in next(os.walk(trunk_tests_builds_dir))[1]]
+                self.requested_build_names = [name for name in next(os.walk(trunk_tests_builds_dir))[1] if not name[0] == '.']
             found_build_names = []
             for build_name in self.requested_build_names:
@@ -1017 +1029 @@
 
             if 'all' in self.test_case_names:
-                self.test_case_names = sorted([name for name in next(os.walk(trunk_tests_cases_dir))[1]])
+                self.test_case_names = sorted([name for name in next(os.walk(trunk_tests_cases_dir))[1] if not name[0] == '.'])
 
             additional_initial_runs_2 = [self.test_case_names]
@@ -1227 +1239 @@
                         if j and (jd or jd is None):
                             n_failed += 1
-            logger.to_all(r.format('Tests:', n_all, n_ok, n_debugged, n_failed))
+            logger.to_all(r.format('Tests:', n_all, n_ok, n_debugged, n_failed) + '\n')
             total_failed += n_failed
             total_debugged += n_debugged
@@ -1251 +1263 @@
 
     def get_items(self):
-        case_names = [name for name in next(os.walk(trunk_tests_cases_dir))[1]]
+        case_names = [name for name in next(os.walk(trunk_tests_cases_dir))[1] if not name[0] == '.']
         return case_names + ['all']
 
@@ -1258 +1270 @@
 
     def get_items(self):
-        build_names = [name for name in next(os.walk(trunk_tests_builds_dir))[1]]
+        build_names = [name for name in next(os.walk(trunk_tests_builds_dir))[1] if not name[0] == '.']
         return build_names + ['all']
 
@@ -1310 +1322 @@
             dest='dry_run',
             help='Prepare and process all requested tests without actually building or executing PALM.',
+            required=False,
+        )
+        self.add_argument(
+            '--no-color',
+            action='store_true',
+            dest='no_color',
+            help='Disable colored terminal output.',
             required=False,
         )