Fix an issue in pytest 3.0 that was preventing xpasses from being rep…

…orted correctly
xlz926 · Sep 23, 2016 · 19b909b · 19b909b
1 parent 2415dcd
commit 19b909b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,7 @@ Release Notes
 
 * Fix corrupt image asset files
 * Remove image links from self-contained report
+* Fix issue with unexpected passes not being reported in pytest 3.0
 
 **1.10.0 (2016-08-09)**
 

diff --git a/pytest_html/plugin.py b/pytest_html/plugin.py
@@ -240,12 +240,17 @@ def _appendrow(self, outcome, report):
 
     def append_passed(self, report):
         if report.when == 'call':
-            self.passed += 1
-            self._appendrow('Passed', report)
+            if hasattr(report, "wasxfail"):
+                self.xpassed += 1
+                self._appendrow('XPassed', report)
+            else:
+                self.passed += 1
+                self._appendrow('Passed', report)
 
     def append_failed(self, report):
         if report.when == "call":
             if hasattr(report, "wasxfail"):
+                # pytest < 3.0 marked xpasses as failures
                 self.xpassed += 1
                 self._appendrow('XPassed', report)
             else: