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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: test-reporting
-Version: 3.7.2
+Version: 3.7.4
 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.4}/reporting/publisher.py

@@ -473,7 +473,7 @@ class Publisher:
                 tag = run.get('regression_tag') or self._date_tag(run.get('timestamp'))
                 ts = run.get('timestamp', '')
 
-                # Suite summary
+                # Suite summary (kept for backwards compatibility)
                 if suite not in suites:
                     suites[suite] = {'name': suite, 'last_run': ts,
                                      'last_pass_rate': 0, 'runs': []}
@@ -494,7 +494,7 @@ class Publisher:
                     'duration_seconds': run.get('duration_seconds', 0),
                 })
 
-                # Regression grouping
+                # Regression grouping - group by actual test files, not suite names
                 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 +503,39 @@ 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)
-                if existing:
-                    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)})
-                else:
-                    reg['suites'].append({'suite': 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)})
+                
+                # Process each test file in this run
+                for test_file in run.get('test_files', []):
+                    file_name = test_file.get('file_name', 'unknown')
+                    # Strip .py extension for consistency
+                    base_file_name = file_name.replace('.py', '')
+                    
+                    existing = next((s for s in reg['suites'] if s['suite'] == base_file_name), None)
+                    if existing:
+                        # Accumulate stats for multiple runs of the same file
+                        existing['total_tests'] += test_file.get('total', 0)
+                        existing['passed'] += test_file.get('passed', 0)
+                        existing['failed'] += test_file.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['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:
+                        file_total = test_file.get('total', 0)
+                        file_passed = test_file.get('passed', 0)
+                        file_failed = test_file.get('failed', 0)
+                        file_pass_rate = round((file_passed / file_total * 100) if file_total > 0 else 0, 1)
+                        reg['suites'].append({'suite': base_file_name, 'timestamp': ts,
+                                              'run_id': run.get('run_id'),
+                                              'pass_rate': file_pass_rate,
+                                              'total_tests': file_total,
+                                              'passed': file_passed,
+                                              'failed': file_failed,
+                                              'run_count': 1})
 
             # Compute regression combined stats
             for reg in regressions.values():

{test_reporting-3.7.2 → test_reporting-3.7.4}/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>'
+              ? '<span class="run-count-badge" title="Ran ' + runCount + ' times in this regression">×' + 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 + '\', \'' + reg.tag + '\')"'
+              : '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>' +
@@ -685,14 +663,23 @@
     if (runId) location.href = 'run.html?r=' + encodeURIComponent(runId) + '&p=' + encodeURIComponent(projectName);
   }
 
-  function navigateToHistoryWithSearch(fileName) {
-    // Switch to Run History tab
-    switchTab('history');
+  function navigateToHistoryWithSearch(fileName, tag) {
+    // 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');
       if (searchInput) {
-        searchInput.value = fileName;
+        // Combine file name and tag for search
+        const searchValue = tag ? fileName + ' ' + tag : fileName;
+        searchInput.value = searchValue;
         filterHistory();
         // Scroll to the table
         searchInput.scrollIntoView({ behavior: 'smooth', block: 'start' });
@@ -916,7 +903,9 @@
       var bg = f.pass_rate >= 95 ? '#276749' : f.pass_rate >= 80 ? '#975a16' : '#9b2c2c';
       var bgLight = f.pass_rate >= 95 ? '#38a169' : f.pass_rate >= 80 ? '#d69e2e' : '#e53e3e';
       const hiddenClass = i >= limit ? ' treemap-cell-hidden' : '';
-      const clickAttr = ' onclick="navigateToHistoryWithSearch(\'' + f.file_name + '\')" style="cursor:pointer;"';
+      // Strip .py extension for search to match display format
+      const searchName = f.file_name.replace(/\.py$/, '');
+      const clickAttr = ' onclick="navigateToHistoryWithSearch(\'' + searchName + '\')" style="cursor:pointer;"';
       return '<div class="treemap-cell' + hiddenClass + '" style="width:' + width + 'px;background:' + bgLight + ';" title="' + f.file_name + ': ' + f.pass_rate.toFixed(1) + '% pass rate (' + f.total_runs + ' runs) - Click to view all runs"' + clickAttr + '>' +
         '<div class="treemap-rate">' + f.pass_rate.toFixed(0) + '%</div>' +
         '<div class="treemap-name">' + f.file_name + '</div>' +
@@ -1048,7 +1037,7 @@
         '<span style="font-size:13px;color:var(--muted)"><span id="visibleRunCount">' + recentRuns.length + '</span> of ' + recentRuns.length + ' runs across ' + names.length + ' test ' + plural(names.length, 'file') + '</span>' +
       '</div>' +
       '<div class="search-wrap">' +
-        '<input type="text" id="historySearch" class="search-input" placeholder="Search by test file name..." oninput="filterHistory()" />' +
+        '<input type="text" id="historySearch" class="search-input" placeholder="Search by test file name or tag..." oninput="filterHistory()" />' +
       '</div>' +
       '<div class="section-body-flush">' +
         '<table class="hist-table" id="historyTable">' +
@@ -1126,9 +1115,13 @@
     
     rows.forEach(function(row) {
       const fileNameCell = row.querySelector('td:nth-child(3)');
+      const tagCell = row.querySelector('td:nth-child(4)');
       if (fileNameCell) {
         const fileName = fileNameCell.textContent.toLowerCase();
-        if (fileName.includes(searchTerm)) {
+        const tag = tagCell ? tagCell.textContent.toLowerCase() : '';
+        // Match if search term is in file name OR tag
+        const combinedText = fileName + ' ' + tag;
+        if (combinedText.includes(searchTerm)) {
           row.style.display = '';
           visibleCount++;
         } else {

{test_reporting-3.7.2 → test_reporting-3.7.4}/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.4',
     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.4}/test_reporting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: test-reporting
-Version: 3.7.2
+Version: 3.7.4
 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