Update tests

--HG--
branch : combine-from-multiple-dirs

3 files changed, 34 insertions, 26 deletions

diff --git a/coverage/data.py b/coverage/data.py
index ed79f794..fa43ff7e 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -208,7 +208,7 @@ class CoverageData(object):
         data_dir, local = os.path.split(self.filename)
         localdot = local + '.*'
 
-        data_dirs = data_dirs or [data_dir] or ['.']
+        data_dirs = data_dirs or [data_dir]
         files_to_combine = []
         for d in data_dirs:
             pattern = os.path.join(os.path.abspath(d), localdot)
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 54d84197..b616ed51 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -213,13 +213,20 @@ class CmdLineTest(BaseCmdLineTest):
             """)
 
     def test_combine(self):
-        # coverage combine
+        # coverage combine with args
         self.cmd_executes("combine datadir1", """\
             .coverage()
             .load()
             .combine(["datadir1"])
             .save()
             """)
+        # coverage combine without args
+        self.cmd_executes("combine", """\
+            .coverage()
+            .load()
+            .combine(None)
+            .save()
+            """)
 
     def test_debug(self):
         self.cmd_help("debug", "What information would you like: data, sys?")
diff --git a/tests/test_data.py b/tests/test_data.py
index 9156e5a9..ef57f0cb 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -158,28 +158,29 @@ class DataTest(CoverageTest):
             )
         self.assert_measured_files(covdata3, ['./a.py', './sub/b.py'])
 
+
+class DataTestInTempDir(DataTest):
+    """Test cases for coverage.data."""
+
+    run_in_temp_dir = True
+
     def test_combining_from_different_directories(self):
-        try:
-            covdata1 = CoverageData()
-            covdata1.add_line_data(DATA_1)
-            os.makedirs('cov1')
-            covdata1.write_file('cov1/.coverage.1')
-
-            covdata2 = CoverageData()
-            covdata2.add_line_data(DATA_2)
-            os.makedirs('cov2')
-            covdata2.write_file('cov2/.coverage.2')
-
-            covdata3 = CoverageData()
-            covdata3.combine_parallel_data(data_dirs=[
-                'cov1/',
-                'cov2/',
-                ])
-
-            self.assert_summary(covdata3, SUMMARY_1_2)
-            self.assert_measured_files(covdata3, MEASURED_FILES_1_2)
-        finally:
-            # Use shutil here because if something goes wrong above, these
-            # dirs may not be empty and os.rmdir would fail to remove them.
-            shutil.rmtree('cov1')
-            shutil.rmtree('cov2')
+        covdata1 = CoverageData()
+        covdata1.add_line_data(DATA_1)
+        os.makedirs('cov1')
+        covdata1.write_file('cov1/.coverage.1')
+
+        covdata2 = CoverageData()
+        covdata2.add_line_data(DATA_2)
+        os.makedirs('cov2')
+        covdata2.write_file('cov2/.coverage.2')
+
+        covdata3 = CoverageData()
+        covdata3.combine_parallel_data(data_dirs=[
+            'cov1/',
+            'cov2/',
+            ])
+
+        self.assert_summary(covdata3, SUMMARY_1_2)
+        self.assert_measured_files(covdata3, MEASURED_FILES_1_2)
+