Switch some uses of old command line syntax to new

tests/farm/annotate/annotate_dir.py

@@ -1,7 +1,7 @@
 copy("src", "run")
 run("""
-    coverage -e -x multi.py
-    coverage -a -d out_anno_dir
+    coverage run multi.py
+    coverage annotate -d out_anno_dir
     """, rundir="run")
 compare("run/out_anno_dir", "gold_anno_dir", "*,cover", left_extra=True)
 clean("run")

tests/farm/annotate/run.py

@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
-    coverage -e -x white.py
-    coverage -a white.py
+    coverage run white.py
+    coverage annotate white.py
     """, rundir="out")
 compare("out", "gold", "*,cover")
 clean("out")

tests/farm/annotate/run_multi.py

@@ -1,7 +1,7 @@
 copy("src", "out_multi")
 run("""
-    coverage -e -x multi.py
-    coverage -a
+    coverage run multi.py
+    coverage annotate
     """, rundir="out_multi")
 compare("out_multi", "gold_multi", "*,cover")
 clean("out_multi")

tests/farm/run/run_chdir.py

@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
     coverage run chdir.py
-    coverage -r
+    coverage report
     """, rundir="out", outfile="stdout.txt")
 contains("out/stdout.txt",
         "Line One",

tests/farm/run/run_timid.py

@@ -17,8 +17,8 @@
 copy("src", "out")
 run("""
     python showtrace.py none
-    coverage -e -x showtrace.py regular
-    coverage -e -x --timid showtrace.py timid
+    coverage run showtrace.py regular
+    coverage run --timid showtrace.py timid
     """, rundir="out", outfile="showtraceout.txt")
 
 # When running without coverage, no trace function
@@ -42,8 +42,8 @@
 os.environ['COVERAGE_OPTIONS'] = '--timid'
 
 run("""
-    coverage -e -x showtrace.py regular
-    coverage -e -x --timid showtrace.py timid
+    coverage run showtrace.py regular
+    coverage run --timid showtrace.py timid
     """, rundir="out", outfile="showtraceout.txt")
 
 contains("out/showtraceout.txt",

tests/farm/run/run_xxx.py

@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
-    coverage -e -x xxx
-    coverage -r
+    coverage run xxx
+    coverage report
     """, rundir="out", outfile="stdout.txt")
 contains("out/stdout.txt",
         "xxx: 3 4 0 7",

tests/test_farm.py

@@ -26,8 +26,8 @@ class FarmTestCase(object):
 
         copy("src", "out")
         run('''
-            coverage -x white.py
-            coverage -a white.py
+            coverage run white.py
+            coverage annotate white.py
             ''', rundir="out")
         compare("out", "gold", "*,cover")
         clean("out")

tests/test_process.py

@@ -26,7 +26,7 @@ def test_save_on_exit(self):
             """)
 
         self.assert_doesnt_exist(".coverage")
-        self.run_command("coverage -x mycode.py")
+        self.run_command("coverage run mycode.py")
         self.assert_exists(".coverage")
 
     def test_environment(self):
@@ -39,7 +39,7 @@ def test_environment(self):
             """)
 
         self.assert_doesnt_exist(".coverage")
-        out = self.run_command("coverage -x mycode.py")
+        out = self.run_command("coverage run mycode.py")
         self.assert_exists(".coverage")
         self.assertEqual(out, 'done\n')
 
@@ -55,19 +55,19 @@ def test_combine_parallel_data(self):
             print('done')
             """)
 
-        out = self.run_command("coverage -x -p b_or_c.py b")
+        out = self.run_command("coverage run -p b_or_c.py b")
         self.assertEqual(out, 'done\n')
         self.assert_doesnt_exist(".coverage")
 
-        out = self.run_command("coverage -x -p b_or_c.py c")
+        out = self.run_command("coverage run -p b_or_c.py c")
         self.assertEqual(out, 'done\n')
         self.assert_doesnt_exist(".coverage")
 
         # After two -p runs, there should be two .coverage.machine.123 files.
         self.assertEqual(self.number_of_data_files(), 2)
 
         # Combine the parallel coverage data files into .coverage .
-        self.run_command("coverage -c")
+        self.run_command("coverage combine")
         self.assert_exists(".coverage")
 
         # After combining, there should be only the .coverage file.
@@ -91,23 +91,23 @@ def test_combine_parallel_data_in_two_steps(self):
             print('done')
             """)
 
-        out = self.run_command("coverage -x -p b_or_c.py b")
+        out = self.run_command("coverage run -p b_or_c.py b")
         self.assertEqual(out, 'done\n')
         self.assert_doesnt_exist(".coverage")
         self.assertEqual(self.number_of_data_files(), 1)
 
         # Combine the (one) parallel coverage data file into .coverage .
-        self.run_command("coverage -c")
+        self.run_command("coverage combine")
         self.assert_exists(".coverage")
         self.assertEqual(self.number_of_data_files(), 1)
 
-        out = self.run_command("coverage -x -p b_or_c.py c")
+        out = self.run_command("coverage run --append -p b_or_c.py c")
         self.assertEqual(out, 'done\n')
         self.assert_exists(".coverage")
         self.assertEqual(self.number_of_data_files(), 2)
 
         # Combine the parallel coverage data files into .coverage .
-        self.run_command("coverage -c")
+        self.run_command("coverage combine")
         self.assert_exists(".coverage")
 
         # After combining, there should be only the .coverage file.
@@ -378,7 +378,7 @@ def main():
             self.assertEqual(self.number_of_data_files(), 2)
 
             # Combine the parallel coverage data files into .coverage .
-            self.run_command("coverage -c")
+            self.run_command("coverage combine")
             self.assert_exists(".coverage")
 
             # After combining, there should be only the .coverage file.

tests/test_summary.py

@@ -38,9 +38,9 @@ def last_line_squeezed(self, report):
         return re.sub(r"\s+", " ", last_line)
 
     def test_report(self):
-        out = self.run_command("coverage -x mycode.py")
+        out = self.run_command("coverage run mycode.py")
         self.assertEqual(out, 'done\n')
-        report = self.report_from_command("coverage -r")
+        report = self.report_from_command("coverage report")
 
         # Name                                              Stmts   Miss  Cover
         # ---------------------------------------------------------------------
@@ -58,8 +58,8 @@ def test_report(self):
 
     def test_report_just_one(self):
         # Try reporting just one module
-        self.run_command("coverage -x mycode.py")
-        report = self.report_from_command("coverage -r mycode.py")
+        self.run_command("coverage run mycode.py")
+        report = self.report_from_command("coverage report mycode.py")
 
         # Name     Stmts   Miss  Cover
         # ----------------------------
@@ -91,8 +91,8 @@ def test_report_wildcard(self):
     def test_report_omitting(self):
         # Try reporting while omitting some modules
         prefix = os.path.split(__file__)[0]
-        self.run_command("coverage -x mycode.py")
-        report = self.report_from_command("coverage -r -o '%s/*'" % prefix)
+        self.run_command("coverage run mycode.py")
+        report = self.report_from_command("coverage report --omit '%s/*'" % prefix)
 
         # Name     Stmts   Miss  Cover
         # ----------------------------
@@ -148,7 +148,7 @@ def test_dotpy_not_python(self):
 
         self.run_command("coverage run mycode.py")
         self.make_file("mycode.py", "This isn't python at all!")
-        report = self.report_from_command("coverage -r mycode.py")
+        report = self.report_from_command("coverage report mycode.py")
 
         # pylint: disable=C0301
         # Name     Stmts   Miss  Cover
@@ -171,7 +171,7 @@ def test_dotpy_not_python_ignored(self):
         # but we've said to ignore errors, so there's no error reported.
         self.run_command("coverage run mycode.py")
         self.make_file("mycode.py", "This isn't python at all!")
-        report = self.report_from_command("coverage -r -i mycode.py")
+        report = self.report_from_command("coverage report -i mycode.py")
 
         # Name     Stmts   Miss  Cover
         # ----------------------------
@@ -187,7 +187,7 @@ def test_dothtml_not_python(self):
         self.run_command("coverage run mycode.html")
         # Before reporting, change it to be an HTML file.
         self.make_file("mycode.html", "<h1>This isn't python at all!</h1>")
-        report = self.report_from_command("coverage -r mycode.html")
+        report = self.report_from_command("coverage report mycode.html")
 
         # Name     Stmts   Miss  Cover
         # ----------------------------