include utilities_test subsuite in overall test suite (+ trivial code style fixes)

Author: boegel

easybuild/tools/filetools.py

@@ -60,7 +60,7 @@
 from easybuild.tools.build_log import EasyBuildError, dry_run_msg, print_msg, print_warning
 from easybuild.tools.config import DEFAULT_WAIT_ON_LOCK_INTERVAL, GENERIC_EASYBLOCK_PKG, build_option, install_path
 from easybuild.tools.py2vs3 import HTMLParser, std_urllib, string_type
-from easybuild.tools.utilities import nub, remove_unwanted_chars, natural_keys
+from easybuild.tools.utilities import natural_keys, nub, remove_unwanted_chars
 
 try:
     import requests
@@ -1032,7 +1032,7 @@ def search_file(paths, query, short=False, ignore_dirs=None, silent=False, filen
                 if common_prefix is not None and len(common_prefix) > len(var) * 2:
                     var_defs.append((var, common_prefix))
                     var_spec = '$' + var
-                    # Replace the common prefix by  var_spec
+                    # Replace the common prefix by var_spec
                     path_hits = (var_spec + fn[len(common_prefix):] for fn in path_hits)
             hits.extend(path_hits)
 

test/framework/suite.py

@@ -77,6 +77,7 @@
 import test.framework.toy_build as t
 import test.framework.type_checking as et
 import test.framework.tweak as tw
+import test.framework.utilities_test as u
 import test.framework.variables as v
 import test.framework.yeb as y
 
@@ -118,7 +119,7 @@
 # call suite() for each module and then run them all
 # note: make sure the options unit tests run first, to avoid running some of them with a readily initialized config
 tests = [gen, bl, o, r, ef, ev, ebco, ep, e, mg, m, mt, f, run, a, robot, b, v, g, tcv, tc, t, c, s, lic, f_c,
-         tw, p, i, pkg, d, env, et, y, st, h, ct, lib]
+         tw, p, i, pkg, d, env, et, y, st, h, ct, lib, u]
 
 SUITE = unittest.TestSuite([x.suite() for x in tests])
 res = unittest.TextTestRunner().run(SUITE)