Paperwork for last merge

2 files changed, 10 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ba443b56..ed208e2f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,14 @@ Change history for Coverage.py
 ------------------------------
 
 
+Latest
+------
+
+- All the reporting functions now behave the same if no data had been
+  collected, exiting with a status code of 1.  Fixed ``fail_under`` to be
+  applied even when the report is empty.  Thanks, Ionel Cristian Mărieș.
+
+
 Version 4.0a6 --- 21 June 2015
 ------------------------------
 
diff --git a/tests/test_process.py b/tests/test_process.py
index 3fcaa9cc..17ac125a 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -705,6 +705,7 @@ class FailUnderTest(CoverageTest):
 
 
 class FailUnderNoFilesTest(CoverageTest):
+    """Test that nothing to report results in an error exit status."""
     def setUp(self):
         super(FailUnderNoFilesTest, self).setUp()
         self.make_file(".coveragerc", "[report]\nfail_under = 99\n")
@@ -726,6 +727,7 @@ class FailUnderNoFilesTest(CoverageTest):
 
 
 class FailUnderEmptyFilesTest(CoverageTest):
+    """Test that empty files produce the proper fail_under exit status."""
     def setUp(self):
         super(FailUnderEmptyFilesTest, self).setUp()