Merge pull request #82 from george0st/changes

Bug fixing
george0st · Oct 22, 2024 · dfb3f45 · dfb3f45
2 parents 9c1fce6 + 314d65d
commit dfb3f45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/qgate_perf/version.py b/qgate_perf/version.py
@@ -1,3 +1,3 @@
 # Store the version here so:
 
-__version__ = '0.4.41'
+__version__ = '0.4.42'
diff --git a/tests/test_graph.py b/tests/test_graph.py
@@ -206,28 +206,22 @@ def test_graph_percentile(self):
 
         setup=RunSetup(duration_second=2, start_delay=0, parameters={"percentile": 0.95})
         generator.run_bulk_executor([[1,1], [1,5]], [[4,4],[8,4],[16,4]], setup)
-        generator.create_graph_perf(self.OUTPUT_ADR)
-
-        today = datetime.datetime.now().strftime("%Y-%m-%d")
-
-        # check relevant files
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "2 sec", today, f"PRF-test_percentile-*-bulk-*.png"))
-        self.assertTrue(len(file)==2)
-        print(file[0])
+        output=generator.create_graph_perf(self.OUTPUT_ADR)
+        self.assertTrue(len(output)==2)
 
     def test_graph_onlynew(self):
 
         generator = ParallelExecutor(prf_test,
                                      label="test_percentile",
                                      detail_output=True,
-                                     output_file=path.join(self.OUTPUT_ADR, "only_new", "perf_test_percentile.txt"))
+                                     output_file=path.join(self.OUTPUT_ADR, "perf_test_only_new.txt"))
 
         setup=RunSetup(duration_second=2, start_delay=0, parameters={"percentile": 0.95})
         generator.run_bulk_executor([[1,1]], [[1,1]], setup)
 
-        output=generator.create_graph_perf(self.OUTPUT_ADR, only_new = True)
+        output=generator.create_graph_perf(path.join(self.OUTPUT_ADR, "only_new"), only_new = True)
         self.assertTrue(len(output) == 1)
 
-        output=generator.create_graph_perf(self.OUTPUT_ADR, only_new = True)
+        output=generator.create_graph_perf(path.join(self.OUTPUT_ADR, "only_new"), only_new = True)
         self.assertTrue(len(output) == 0)