Linting and revert changes to tests

Author: ocaisa

easybuild/tools/toolchain/toolchain.py

@@ -1242,10 +1242,10 @@ def _add_dependency_cpp_headers(self, dep_root, extra_dirs=None):
             self.log.info(f"Adding header paths to toolchain variable '{env_var}': {dep_root} (subdirs: {header_dirs})")
             # it may already exist, in which case we remove it to add it back with higher priority
             for header_dir in header_dirs:
-                self.log.debug(f"Existing variables are {self.variables.keys()}")
                 if env_var in self.variables.keys():
                     header_path = os.path.join(dep_root, header_dir)
-                    self.log.debug(f"Attempting to remove any previous instance of {header_path} from {env_var} list: {self.variables[env_var]}")
+                    self.log.debug(f"Attempting to remove any previous instance of {header_path} from {env_var} list: "
+                                   f"{self.variables[env_var]}")
                     self.variables[env_var].try_remove([header_path])
                     self.log.debug(f"New value of {env_var} list: {self.variables[env_var]}")
             self.variables.append_subdirs(env_var, dep_root, subdirs=header_dirs)

test/framework/easyblock.py

@@ -3802,7 +3802,7 @@ def test_exts_deps_build_env(self):
                     regex = re.compile(f'^{env_var}=' + ' '.join('-I/[^ ]+/' + p for p in paths) + '$', re.M)
                 else:
                     self.fail(f"Unknown type of environment variable: ${env_var}")
-                self.assertTrue(regex.search(log_txt), f"Pattern '{regex.pattern}' not found in log output \n{log_txt}")
+                self.assertTrue(regex.search(log_txt), f"Pattern '{regex.pattern}' not found in log output")
 
         # verify fix made in https://github.com/easybuilders/easybuild-framework/pull/5048
         test_ec_txt = read_file(toy_ec)