Merge pull request #111 from swryan/109_deprecations

Fixed deprecations report to handle SubTests, Fixed duration of SubTests
OpenMDAO · May 17, 2024 · c45ee07 · c45ee07
2 parents 16c6d10 + a539776
commit c45ee07
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
@@ -31,12 +31,12 @@ jobs:
           # test on Ubuntu
           - NAME: Ubuntu Baseline
             OS: ubuntu-latest
-            PY: '3.11'
+            PY: '3.12'
 
           # test on MacOS
           - NAME: MacOS Baseline
             OS: macos-latest
-            PY: '3.11'
+            PY: '3.12'
 
     runs-on: ${{ matrix.OS }}
 
@@ -77,7 +77,7 @@ jobs:
         run: |
           cd $HOME
 
-          testflo testflo.tests || RC=$?
+          testflo testflo.tests -vs --show_skipped --durations=5 --durations-min=0 --deprecations_report dep.txt || RC=$?
 
           if [[ $RC -ne 1 ]]; then
             echo "Expected some tests to fail."
@@ -104,11 +104,14 @@ jobs:
             exit 11
           fi
 
+          grep "Deprecations Report" dep.txt
+          rm dep.txt
+
       - name: Run tests in serial
         run: |
           cd $HOME
 
-          testflo -n 1 testflo.tests || RC=$?
+          testflo testflo.tests -n 1 -vs --show_skipped --durations=5 --durations-min=0 --deprecations_report dep.txt || RC=$?
 
           if [[ $RC -ne 1 ]]; then
             echo "Expected some tests to fail."
@@ -135,6 +138,9 @@ jobs:
             exit 11
           fi
 
+          grep "Deprecations Report" dep.txt
+          rm dep.txt
+
       - name: Notify slack of failure
         uses: act10ns/[email protected]
         with:

diff --git a/testflo/deprecations.py b/testflo/deprecations.py
@@ -16,10 +16,11 @@ def get_iter(self, input_iter):
 
         deprecations = {}
 
-        for test in input_iter:
-            for msg, locs in test.deprecations.items():
-                deprecations[msg] = deprecations.get(msg, set()) | locs
-            yield test
+        for tests in input_iter:
+            for test in tests:
+                for msg, locs in test.deprecations.items():
+                    deprecations[msg] = deprecations.get(msg, set()) | locs
+                yield test
 
         report = self.generate_report(deprecations)
 

diff --git a/testflo/test.py b/testflo/test.py
@@ -341,11 +341,13 @@ def run(self, queue=None):
                         else:
                             stream_val = ''
                         if ut_subtests:
+                            end_time = time.perf_counter()
                             for sub, err in ut_subtests:
                                 subtest = SubTest(sub._subDescription(), self.spec, self.options)
                                 subtest.status = status
                                 subtest.err_msg = stream_val + err
-                                subtest.end_time = time.perf_counter()
+                                subtest.start_time = self.start_time
+                                subtest.end_time = end_time
                                 subtest.memory_usage = get_memory_usage()
                                 subs.append(subtest)
                         else: