Merge in the default branch

--HG--
branch : ast-branch

1 files changed, 11 insertions, 12 deletions

diff --git a/tests/test_api.py b/tests/test_api.py
index a7cadab3..3ea5b3ef 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -278,18 +278,17 @@ class ApiTest(CoverageTest):
         self.start_import_stop(cov, "code2")
         self.check_code1_code2(cov)
 
-    if 0:   # expected failure
-        # for https://bitbucket.org/ned/coveragepy/issue/79
-        def test_start_save_stop(self):
-            self.make_code1_code2()
-            cov = coverage.Coverage()
-            cov.start()
-            self.import_local_file("code1")
-            cov.save()
-            self.import_local_file("code2")
-            cov.stop()
-
-            self.check_code1_code2(cov)
+    def test_start_save_stop(self):
+        self.skip("Expected failure: https://bitbucket.org/ned/coveragepy/issue/79")
+        self.make_code1_code2()
+        cov = coverage.Coverage()
+        cov.start()
+        self.import_local_file("code1")
+        cov.save()
+        self.import_local_file("code2")
+        cov.stop()
+
+        self.check_code1_code2(cov)
 
     def make_corrupt_data_files(self):
         """Make some good and some bad data files."""