Merged in clytwynec/coverage.py/combine-from-multiple-dirs (pull request #51)

Added ability to combine coverage data files from multiple directories into one file via command line args.

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 775e0033..b616ed51 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -213,11 +213,18 @@ 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()
+            .combine(None)
             .save()
             """)