Fixup: aggregate replaces max in tests and full_run_stats.averages re…

…places report.averages
con · Sep 19, 2024 · 40d43a8 · 40d43a8
1 parent 4c61b2c
commit 40d43a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/con_duct/__main__.py b/src/con_duct/__main__.py
@@ -482,14 +482,14 @@ def execution_summary(self) -> dict[str, Any]:
             "logs_prefix": self.log_paths.prefix if self.log_paths else "",
             "wall_clock_time": self.wall_clock_time,
             "peak_rss": self.full_run_stats.total_rss,
-            "average_rss": self.averages.rss,
+            "average_rss": self.full_run_stats.averages.rss,
             "peak_vsz": self.full_run_stats.total_vsz,
-            "average_vsz": self.averages.vsz,
+            "average_vsz": self.full_run_stats.averages.vsz,
             "peak_pmem": self.full_run_stats.total_pmem,
-            "average_pmem": self.averages.pmem,
+            "average_pmem": self.full_run_stats.averages.pmem,
             "peak_pcpu": self.full_run_stats.total_pcpu,
-            "average_pcpu": self.averages.pcpu,
-            "num_samples": self.averages.num_samples,
+            "average_pcpu": self.full_run_stats.averages.pcpu,
+            "num_samples": self.full_run_stats.averages.num_samples,
             "num_reports": self.number,
         }
 

diff --git a/test/test_report.py b/test/test_report.py
@@ -46,7 +46,7 @@ def test_sample_max_initial_values_one_pid() -> None:
     maxes = Sample()
     ex0 = Sample()
     ex0.add_pid(1, stat0)
-    maxes = maxes.max(ex0)
+    maxes = maxes.aggregate(ex0)
     assert maxes.stats == {1: stat0}
 
 
@@ -55,7 +55,7 @@ def test_sample_max_one_pid() -> None:
     maxes.add_pid(1, stat0)
     ex1 = Sample()
     ex1.add_pid(1, stat1)
-    maxes = maxes.max(ex1)
+    maxes = maxes.aggregate(ex1)
     assert maxes.stats == {1: stat1}
 
 
@@ -64,7 +64,7 @@ def test_sample_max_initial_values_two_pids() -> None:
     ex0 = Sample()
     ex0.add_pid(1, stat0)
     ex0.add_pid(2, stat0)
-    maxes = maxes.max(ex0)
+    maxes = maxes.aggregate(ex0)
     assert maxes.stats == {1: stat0, 2: stat0}
 
 
@@ -74,10 +74,10 @@ def test_sample_maxtwo_pids() -> None:
     maxes.add_pid(2, stat0)
     ex1 = Sample()
     ex1.add_pid(1, stat1)
-    maxes = maxes.max(ex1)
+    maxes = maxes.aggregate(ex1)
     ex2 = Sample()
     ex2.add_pid(2, stat1)
-    maxes = maxes.max(ex2)
+    maxes = maxes.aggregate(ex2)
     assert maxes.stats == {1: stat1, 2: stat1}