WIP: save data with --xfail / -x

testmon/pytest_testmon.py

@@ -140,8 +140,13 @@ def pytest_runtest_protocol(self, item, nextitem):
             yield
 
         self.testmon.start()
-        yield
-        self.testmon.stop_and_save(self.testmon_data, item.config.rootdir.strpath, item.nodeid)
+        result = yield
+        # NOTE: pytest-watch also sends KeyboardInterrupt when changes are
+        # detected.  This should still save the collected data up until then.
+        if result.excinfo and issubclass(result.excinfo[0], KeyboardInterrupt):
+            self.testmon.stop()
+        else:
+            self.testmon.stop_and_save(self.testmon_data, item.config.rootdir.strpath, item.nodeid)
 
     def pytest_runtest_logreport(self, report):
         if report.failed and "xfail" not in report.keywords:
@@ -170,10 +175,12 @@ def pytest_ignore_collect(self, path, config):
     def pytest_internalerror(self, excrepr, excinfo):
         self.testmon_save = False
 
-    def pytest_keyboard_interrupt(self, excinfo):
-        self.testmon_save = False
-
     def pytest_sessionfinish(self, session):
         if self.testmon_save:
             self.testmon_data.write_data()
         self.testmon.close()
+
+    def pytest_terminal_summary(self, terminalreporter, exitstatus=None):
+        if (not self.testmon_save and
+                terminalreporter.config.getvalue('verbose')):
+            terminalreporter.line('testmon: not saving data')

testmon/testmon_core.py

@@ -99,8 +99,11 @@ def start(self):
         self.cov.erase()
         self.cov.start()
 
-    def stop_and_save(self, testmon_data, rootdir, nodeid):
+    def stop(self):
         self.cov.stop()
+
+    def stop_and_save(self, testmon_data, rootdir, nodeid):
+        self.stop()
         if hasattr(self, 'sub_cov_file'):
             self.cov.combine()