Modifying unit tests

Linting
Changed the name of the profiler module.

Author: ChrisPaulBennett

cylc/flow/scripts/profile.py

@@ -25,7 +25,6 @@
 import sys
 import time
 import signal
-import subprocess
 from pathlib import Path
 from dataclasses import dataclass
 from cylc.flow.terminal import cli_function
@@ -36,6 +35,7 @@
 RE_INT = re.compile(r'\d+')
 
 
+
 def get_option_parser() -> COP:
     parser = COP(
         __doc__,
@@ -116,11 +116,9 @@ def get_cgroup_dir():
     # Get the PID of the current process
     pid = os.getpid()
     # Get the cgroup information for the current process
-    result = subprocess.run(['cat', '/proc/' + str(pid) + '/cgroup'],
-                            capture_output=True, text=True, shell=False)
-    if result.stderr:
-        print(result.stderr, file=sys.stderr)
-    result = PID_REGEX.search(result.stdout).group()
+    with open('/proc/' + str(pid) + '/cgroup', 'r') as f:
+        result = f.read()
+    result = PID_REGEX.search(result).group()
     return result
 
 
@@ -154,7 +152,6 @@ def profile(args):
             print(err)
             raise FileNotFoundError("cgroups not found:"
                                     + args.cgroup_location) from err
-
     elif cgroup_version == 2:
         try:
             processes.append(Process(
@@ -191,4 +188,4 @@ def profile(args):
 if __name__ == "__main__":
 
     arg_parser = get_option_parser()
-    profile(arg_parser.parse_args())
+    profile(arg_parser.parse_args([]))

cylc/flow/scripts/profiler.py

@@ -65,11 +65,13 @@ def fixture_get_platform():
     Returns:
         platforms dictionary.
     """
+
     def inner_func(custom_settings=None):
         platform = platform_from_name()
         if custom_settings is not None:
             platform.update(custom_settings)
         return platform
+
     yield inner_func
 
 
@@ -159,9 +161,9 @@ def test_write(fixture_get_platform):
                 "execution_time_limit": 60
             },
             ('\n\n# DIRECTIVES:\n# @ job_name = farm_noises.baa.1'
-                '\n# @ output = directory/job.out\n# @ error = directory/'
-                'job.err\n# @ wall_clock_limit = 120,60\n# @ moo = foo'
-                '\n# @ cluck = bar\n# @ queue')
+             '\n# @ output = directory/job.out\n# @ error = directory/'
+             'job.err\n# @ wall_clock_limit = 120,60\n# @ moo = foo'
+             '\n# @ cluck = bar\n# @ queue')
 
         ),
         (  # Check no directives is correctly written
@@ -217,7 +219,6 @@ def test_write(fixture_get_platform):
                 "job_d": "1/test_task_id/01",
                 "job_file_path": "$HOME/directory/job",
                 "execution_time_limit": 1000
-
             },
             ('\n\n# DIRECTIVES:\n#$ -N farm_noises.baa.1\n#$ -o directory/'
              'job.out\n#$ -e directory/job.err\n#$ -l h_rt=0:16:40\n#$ -V\n#'
@@ -383,7 +384,6 @@ def test_no_script_section_with_comment_only_script():
     }
 
     with io.StringIO() as fake_file:
-
         JobFileWriter()._write_script(fake_file, job_conf)
         blah = fake_file.getvalue()
         print(blah)
@@ -539,4 +539,3 @@ def test_homeless_platform(fixture_get_platform):
         job_sh_txt = job_sh.read()
         if 'HOME' in job_sh_txt:
             raise Exception('$HOME found in job.sh\n{job_sh_txt}')
-