test-reporting 3.7.2__tar.gz → 3.7.3__tar.gz

{test_reporting-3.7.2 → test_reporting-3.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: test-reporting
-Version: 3.7.2
+Version: 3.7.3
 Summary: Multi-project test reporting dashboard — collect results locally or push to S3
 Home-page: https://github.com/amahdy77/test-reporting.git
 Author: Ashfaqur Mahdy

{test_reporting-3.7.2 → test_reporting-3.7.3}/reporting/publisher.py

@@ -495,6 +495,10 @@ class Publisher:
                 })
 
                 # Regression grouping
+                # Strip [TAG] suffix to group reruns with original runs
+                import re
+                base_suite = re.sub(r'\s*\[.*?\]\s*$', '', suite)
+                
                 if tag not in regressions:
                     regressions[tag] = {'tag': tag, 'date': tag[:10], 'suites': [],
                                         'total_tests': 0, 'passed': 0, 'failed': 0, 'pass_rate': 0,
@@ -503,21 +507,28 @@ class Publisher:
                 # Track the latest timestamp for this regression
                 if ts > reg.get('timestamp', ''):
                     reg['timestamp'] = ts
-                existing = next((s for s in reg['suites'] if s['suite'] == suite), None)
+                existing = next((s for s in reg['suites'] if s['suite'] == base_suite), None)
                 if existing:
+                    # Accumulate stats for multiple runs of the same test
+                    existing['total_tests'] += run.get('total_tests', 0)
+                    existing['passed'] += run.get('passed', 0)
+                    existing['failed'] += run.get('failed', 0)
+                    existing['run_count'] = existing.get('run_count', 1) + 1
+                    # Update to latest timestamp and run_id
                     if ts > existing.get('timestamp', ''):
-                        existing.update({'timestamp': ts, 'run_id': run.get('run_id'),
-                                         'pass_rate': run.get('pass_rate', 0),
-                                         'total_tests': run.get('total_tests', 0),
-                                         'passed': run.get('passed', 0),
-                                         'failed': run.get('failed', 0)})
+                        existing['timestamp'] = ts
+                        existing['run_id'] = run.get('run_id')
+                    # Recalculate pass rate based on accumulated totals
+                    if existing['total_tests'] > 0:
+                        existing['pass_rate'] = round((existing['passed'] / existing['total_tests']) * 100, 1)
                 else:
-                    reg['suites'].append({'suite': suite, 'timestamp': ts,
+                    reg['suites'].append({'suite': base_suite, 'timestamp': ts,
                                           'run_id': run.get('run_id'),
                                           'pass_rate': run.get('pass_rate', 0),
                                           'total_tests': run.get('total_tests', 0),
                                           'passed': run.get('passed', 0),
-                                          'failed': run.get('failed', 0)})
+                                          'failed': run.get('failed', 0),
+                                          'run_count': 1})
 
             # Compute regression combined stats
             for reg in regressions.values():

{test_reporting-3.7.2 → test_reporting-3.7.3}/reporting/templates/project.html

@@ -555,75 +555,53 @@
           const rc2 = rateColor(reg.pass_rate);
           const total = lastReg ? lastReg.total_tests || 1 : 1;
           
-          // Group suites by name to detect duplicates
-          // Strip [TAG] suffix to group reruns with original runs
-          const suiteGroups = {};
-          (reg.suites || []).forEach(function(s) {
-            // Remove [TAG] suffix like [RERUN], [RETRY], etc.
-            const baseName = s.suite.replace(/\s*\[.*?\]\s*$/, '');
-            if (!suiteGroups[baseName]) {
-              suiteGroups[baseName] = [];
-            }
-            suiteGroups[baseName].push(s);
+          // Sort suites alphabetically
+          const sortedSuites = (reg.suites || []).slice().sort(function(a, b) {
+            return a.suite.localeCompare(b.suite);
           });
           
-          // Sort suite names alphabetically
-          const sortedSuiteNames = Object.keys(suiteGroups).sort();
-          
-          const fileRows = sortedSuiteNames.map(function(suiteName) {
-            const runs = suiteGroups[suiteName];
-            const runCount = runs.length;
-            
-            // Calculate accumulated averages
-            let totalTests = 0;
-            let totalFailed = 0;
-            let totalSkipped = 0;
-            let totalPassed = 0;
-            let avgPassRate = 0;
-            
-            runs.forEach(function(run) {
-              totalTests += run.total_tests;
-              totalFailed += run.failed;
-              totalSkipped += (run.skipped || 0);
-              totalPassed += (run.total_tests - run.failed - (run.skipped || 0));
-              avgPassRate += run.pass_rate;
-            });
-            
-            avgPassRate = avgPassRate / runCount;
-            
-            // Use first run's ID for navigation
-            const firstRunId = runs[0].run_id;
+          const fileRows = sortedSuites.map(function(s) {
+            const runCount = s.run_count || 1;
+            const totalTests = s.total_tests;
+            const totalFailed = s.failed;
+            const totalPassed = s.passed;
+            const passRate = s.pass_rate;
             
             const failedPct = totalTests > 0 ? (totalFailed / totalTests * 100) : 0;
-            const skippedPct = totalTests > 0 ? (totalSkipped / totalTests * 100) : 0;
-            const passedPct = Math.max(0, 100 - failedPct - skippedPct);
+            const passedPct = totalTests > 0 ? (totalPassed / totalTests * 100) : 0;
+            const skippedPct = Math.max(0, 100 - failedPct - passedPct);
             
             const runBadge = runCount > 1 
               ? '<span class="run-count-badge" title="Ran ' + runCount + ' times">×' + runCount + '</span>'
               : '';
             
             const metaText = runCount > 1
-              ? totalTests + ' tests total · ' + totalFailed + ' failed · avg across ' + runCount + ' runs'
+              ? totalTests + ' tests total · ' + totalFailed + ' failed · accumulated across ' + runCount + ' runs'
               : totalTests + ' tests · ' + totalFailed + ' failed';
             
-            return '<div class="suite-row" onclick="goToRun(\'' + firstRunId + '\')">' +
-              '<div class="suite-name"><span>' + suiteName + '</span>' + runBadge + '</div>' +
+            // If multiple runs, navigate to history with search; otherwise go to single run
+            const clickHandler = runCount > 1
+              ? 'onclick="navigateToHistoryWithSearch(\'' + s.suite + '\')"'
+              : 'onclick="goToRun(\'' + s.run_id + '\')"';
+            
+            return '<div class="suite-row" ' + clickHandler + '>' +
+              '<div class="suite-name"><span>' + s.suite + '</span>' + runBadge + '</div>' +
               '<div class="suite-meta">' + metaText + '</div>' +
               '<div class="suite-bar">' +
-                '<div class="stacked-bar" title="Passed: ' + totalPassed + ' | Failed: ' + totalFailed + ' | Skipped: ' + totalSkipped + (runCount > 1 ? ' (accumulated)' : '') + '">' +
+                '<div class="stacked-bar" title="Passed: ' + totalPassed + ' | Failed: ' + totalFailed + (runCount > 1 ? ' (accumulated across ' + runCount + ' runs)' : '') + '">' +
                   '<div class="stacked-green" style="width:' + passedPct.toFixed(1) + '%"></div>' +
                   '<div class="stacked-red" style="width:' + failedPct.toFixed(1) + '%"></div>' +
                   '<div class="stacked-grey" style="width:' + skippedPct.toFixed(1) + '%"></div>' +
                 '</div>' +
               '</div>' +
-              '<div class="suite-rate ' + rateColor(avgPassRate) + '">' + avgPassRate.toFixed(0) + '%</div>' +
+              '<div class="suite-rate ' + rateColor(passRate) + '">' + passRate.toFixed(0) + '%</div>' +
             '</div>';
           }).join('');
 
           const isOpen = i === 0;
           const regDateTime = reg.timestamp ? fmtDateTime(reg.timestamp) : '';
           const regTitle = regDateTime ? reg.tag + ' · ' + regDateTime : reg.tag;
-          const uniqueSuiteCount = Object.keys(suiteGroups).length;
+          const uniqueSuiteCount = sortedSuites.length;
           return '<div class="regression">' +
             '<div class="reg-head" onclick="toggleReg(this)">' +
               '<div>' +
@@ -686,8 +664,15 @@
   }
 
   function navigateToHistoryWithSearch(fileName) {
-    // Switch to Run History tab
-    switchTab('history');
+    // Find and click the Run History tab button
+    const historyBtn = Array.from(document.querySelectorAll('.tab-btn')).find(function(btn) {
+      return btn.textContent.trim() === 'Run History';
+    });
+    
+    if (historyBtn) {
+      switchTab('history', historyBtn);
+    }
+    
     // Wait for tab to render, then set search value and trigger filter
     setTimeout(function() {
       const searchInput = document.getElementById('historySearch');

{test_reporting-3.7.2 → test_reporting-3.7.3}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name='test-reporting',
-    version='3.7.2',
+    version='3.7.3',
     description='Multi-project test reporting dashboard — collect results locally or push to S3',
     long_description=long_description,
     long_description_content_type="text/markdown",

{test_reporting-3.7.2 → test_reporting-3.7.3}/test_reporting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: test-reporting
-Version: 3.7.2
+Version: 3.7.3
 Summary: Multi-project test reporting dashboard — collect results locally or push to S3
 Home-page: https://github.com/amahdy77/test-reporting.git
 Author: Ashfaqur Mahdy