Advance on enoslib integration

tbarbette · Jul 14, 2024 · 8560f2a · 8560f2a
1 parent c6dabca
commit 8560f2a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/npf/executor/enoslibexecutor.py b/npf/executor/enoslibexecutor.py
@@ -42,6 +42,8 @@ def exec(self, cmd : str, bin_paths : List[str]=[],
         Returns:
             [int, str, str, int]: pid, stdout, stderr, return code
         """
+        if testdir:
+            cmd = "mkdir -p " + testdir + " && cd " + testdir + ";\n" + cmd;
 
         if not title:
             title = self.machine.address

diff --git a/npf/executor/sshexecutor.py b/npf/executor/sshexecutor.py
@@ -47,7 +47,10 @@ def get_connection(self, cache=True):
         return ssh
 
 
-    def exec(self, cmd, bin_paths : List[str] = None, queue: Queue = None, options = None, stdin = None, timeout=None, sudo=False, testdir=None, event=None, title=None, env={}, virt = "", raw = False):
+    def exec(self, cmd, bin_paths : List[str] = None,
+             queue: Queue = None, options = None,
+             stdin = None, timeout=None, sudo=False, testdir=None,
+             event=None, title=None, env={}, virt = "", raw = False):
         if testdir:
             cmd = "mkdir -p " + testdir + " && cd " + testdir + ";\n" + cmd;
         if not title:

diff --git a/npf/test.py b/npf/test.py
@@ -939,8 +939,9 @@ def execute(self, build, run, v, n_runs=1, n_retry=0, allowed_types=SectionScrip
 
                 if len(all_pyexits) >0 and allowed_types != set([SectionScript.TYPE_INIT]):
                     vs = {'RESULTS': new_data_results,
-                          'TIME_RESULTS': new_kind_results["time"], #Deprecated
-                          'KIND_RESULTS': new_kind_results}
+                          'TIME_RESULTS': new_time_results["time"], #Deprecated
+                          'KIND_RESULTS': new_time_results, #Deprecated
+                          'NS_RESULTS': new_time_results}
                     vs.update(v)
 
                     for late_variables in self.get_late_variables():

diff --git a/npf_compare.py b/npf_compare.py
@@ -55,7 +55,10 @@ def main():
     series, time_series = comparator.run(test_name=args.test_files,
                                          tags=args.tags,
                                          options=args,
-                                         on_finish=lambda series,time_series:group_series(filename,args,series,time_series,options=args) if args.iterative else None)
+                                         on_finish=
+                                            lambda series,time_series:
+                                                group_series(filename,args,series,time_series,options=args) if args.iterative else None
+                                        )
 
     group_series(filename, args, series, time_series, options=args)