Merge pull request #27 from george0st/changes

Add output path with duration
george0st · Sep 2, 2024 · a81128e · a81128e
2 parents 04d9034 + 959904a
commit a81128e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -9,7 +9,7 @@ contourpy>=1.0.0,<=1.3.0
 psutil>=5.9.0,<=6.0.0
 packaging>=21.0
 
-qgate_graph==1.4.8
+qgate_graph==1.4.12
 
 coverage>=7
 coverage-badge>=1

diff --git a/qgate_perf/version.py b/qgate_perf/version.py
@@ -1,3 +1,3 @@
 # Store the version here so:
 
-__version__ = '0.4.11'
+__version__ = '0.4.12'
diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ contourpy>=1.0.0,<=1.3.0
 psutil>=5.9.0,<=6.0.0
 packaging>=21.0
 
-qgate_graph==1.4.9
+qgate_graph==1.4.12
diff --git a/tests/test_graph.py b/tests/test_graph.py
@@ -67,11 +67,11 @@ def test_graph(self):
                                                     setup))
         generator.create_graph(self.OUTPUT_ADR)
 
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_aus_ger-*-bulk-10x10.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_aus_ger-*-bulk-10x10.png"))
         self.assertTrue(len(file) == 1)
         print(file[0])
 
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_aus_ger-*-bulk-100x10.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_aus_ger-*-bulk-100x10.png"))
         self.assertTrue(len(file) == 1)
         print(file[0])
 
@@ -87,7 +87,7 @@ def test_graph_run_exception(self):
         self.assertFalse(generator.run(1,1, setup))
         generator.create_graph(self.OUTPUT_ADR)
 
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_exception-*-bulk-1x1.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception-*-bulk-1x1.png"))
         self.assertTrue(len(file) == 1)
         print(file[0])
 
@@ -103,7 +103,7 @@ def test_graph_runexecutor_exception(self):
         self.assertFalse(generator.run_executor([[2,2]], setup))
         generator.create_graph(self.OUTPUT_ADR)
 
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_exception2-*-bulk-1x1.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception2-*-bulk-1x1.png"))
         self.assertTrue(len(file) == 1)
         print(file[0])
 
@@ -125,11 +125,11 @@ def test_graph_runbulkexecutor_exception_random(self):
         generator.create_graph(self.OUTPUT_ADR)
 
         # check relevant files
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_random-*-bulk-1x1.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_random-*-bulk-1x1.png"))
         self.assertTrue(len(file)==1)
         print(file[0])
 
-        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_random-*-bulk-1x5.png"))
+        file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_random-*-bulk-1x5.png"))
         self.assertTrue(len(file) == 1)
         print(file[0])