summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/farm/run/run_xxx.py2
-rw-r--r--test/test_api.py10
-rw-r--r--test/test_coverage.py12
-rw-r--r--test/test_process.py4
-rw-r--r--test/test_summary.py30
5 files changed, 29 insertions, 29 deletions
diff --git a/test/farm/run/run_xxx.py b/test/farm/run/run_xxx.py
index 3c39f0f7..27967a9f 100644
--- a/test/farm/run/run_xxx.py
+++ b/test/farm/run/run_xxx.py
@@ -6,7 +6,7 @@ run("""
contains("out/stdout.txt",
"xxx: 3 4 0 7",
"\nxxx ", # The reporting line for xxx
- " 7 6 85%" # The reporting data for xxx
+ " 7 1 85%" # The reporting data for xxx
)
doesnt_contain("out/stdout.txt", "No such file or directory")
clean("out")
diff --git a/test/test_api.py b/test/test_api.py
index 1f0ad838..4c491366 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -59,9 +59,9 @@ class ApiTest(CoverageTest):
self.doReportWork("mycode2")
coverage.report(["mycode2.py"])
self.assertEqual(self.stdout(), textwrap.dedent("""\
- Name Stmts Exec Cover Missing
+ Name Stmts Miss Cover Missing
---------------------------------------
- mycode2 7 4 57% 4-6
+ mycode2 7 3 57% 4-6
"""))
def testReportFile(self):
@@ -71,9 +71,9 @@ class ApiTest(CoverageTest):
coverage.report(["mycode3.py"], file=fout)
self.assertEqual(self.stdout(), "")
self.assertEqual(fout.getvalue(), textwrap.dedent("""\
- Name Stmts Exec Cover Missing
+ Name Stmts Miss Cover Missing
---------------------------------------
- mycode3 7 4 57% 4-6
+ mycode3 7 3 57% 4-6
"""))
def testReportDefault(self):
@@ -81,7 +81,7 @@ class ApiTest(CoverageTest):
self.doReportWork("mycode4")
coverage.report()
rpt = re.sub(r"\s+", " ", self.stdout())
- self.assertTrue("mycode4 7 4 57% 4-6" in rpt)
+ self.assertTrue("mycode4 7 3 57% 4-6" in rpt)
def testUnexecutedFile(self):
cov = coverage.coverage()
diff --git a/test/test_coverage.py b/test/test_coverage.py
index e0afd31b..0040e97b 100644
--- a/test/test_coverage.py
+++ b/test/test_coverage.py
@@ -104,7 +104,7 @@ class BasicCoverageTest(CoverageTest):
# Nothing here
d = 6
""",
- [1,2,4,6], report="4 4 100%")
+ [1,2,4,6], report="4 0 100%")
def testIndentationWackiness(self):
# Partial final lines are OK.
@@ -632,7 +632,7 @@ class CompoundStatementTest(CoverageTest):
z = 7
assert x == 3
""",
- [1,2,3,4,5,7,8], "4-7", report="7 4 57% 4-7")
+ [1,2,3,4,5,7,8], "4-7", report="7 3 57% 4-7")
self.check_coverage("""\
a = 1; b = 2; c = 3;
if a != 1:
@@ -643,7 +643,7 @@ class CompoundStatementTest(CoverageTest):
z = 7
assert y == 5
""",
- [1,2,3,4,5,7,8], "3, 7", report="7 5 71% 3, 7")
+ [1,2,3,4,5,7,8], "3, 7", report="7 2 71% 3, 7")
self.check_coverage("""\
a = 1; b = 2; c = 3;
if a != 1:
@@ -654,7 +654,7 @@ class CompoundStatementTest(CoverageTest):
z = 7
assert z == 7
""",
- [1,2,3,4,5,7,8], "3, 5", report="7 5 71% 3, 5")
+ [1,2,3,4,5,7,8], "3, 5", report="7 2 71% 3, 5")
def testElifNoElse(self):
self.check_coverage("""\
@@ -665,7 +665,7 @@ class CompoundStatementTest(CoverageTest):
y = 5
assert x == 3
""",
- [1,2,3,4,5,6], "4-5", report="6 4 66% 4-5")
+ [1,2,3,4,5,6], "4-5", report="6 2 66% 4-5")
self.check_coverage("""\
a = 1; b = 2; c = 3;
if a != 1:
@@ -674,7 +674,7 @@ class CompoundStatementTest(CoverageTest):
y = 5
assert y == 5
""",
- [1,2,3,4,5,6], "3", report="6 5 83% 3")
+ [1,2,3,4,5,6], "3", report="6 1 83% 3")
def testElifBizarre(self):
self.check_coverage("""\
diff --git a/test/test_process.py b/test/test_process.py
index ce98a383..e8e8c8be 100644
--- a/test/test_process.py
+++ b/test/test_process.py
@@ -123,9 +123,9 @@ class ProcessTest(CoverageTest):
# Reporting should still work even with the .rc file
out = self.run_command("coverage report")
self.assertMultiLineEqual(out, textwrap.dedent("""\
- Name Stmts Exec Cover
+ Name Stmts Miss Cover
----------------------------
- b_or_c 7 7 100%
+ b_or_c 7 0 100%
"""))
def test_missing_source_file(self):
diff --git a/test/test_summary.py b/test/test_summary.py
index d2f40aeb..b41a3e7d 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -38,35 +38,35 @@ class SummaryTest(CoverageTest):
self.assertEqual(out, 'done\n')
report = self.report_from_command("coverage -r")
- # Name Stmts Exec Cover
+ # Name Stmts Miss Cover
# ---------------------------------------------------------------------
- # c:/ned/coverage/trunk/test/modules/covmod1 2 2 100%
- # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1 2 2 100%
- # mycode 4 4 100%
+ # c:/ned/coverage/trunk/test/modules/covmod1 2 0 100%
+ # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1 2 0 100%
+ # mycode 4 0 100%
# ---------------------------------------------------------------------
- # TOTAL 8 8 100%
+ # TOTAL 8 0 100%
self.assertFalse("/coverage/__init__/" in report)
self.assertTrue("/test/modules/covmod1 " in report)
self.assertTrue("/test/zipmods.zip/covmodzip1 " in report)
self.assertTrue("mycode " in report)
- self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 8 100%")
+ self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 0 100%")
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")
- # Name Stmts Exec Cover
+ # Name Stmts Miss Cover
# ----------------------------
- # mycode 4 4 100%
+ # mycode 4 0 100%
self.assertEqual(self.line_count(report), 3)
self.assertFalse("/coverage/" in report)
self.assertFalse("/test/modules/covmod1 " in report)
self.assertFalse("/test/zipmods.zip/covmodzip1 " in report)
self.assertTrue("mycode " in report)
- self.assertEqual(self.last_line_squeezed(report), "mycode 4 4 100%")
+ self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
def test_report_omitting(self):
# Try reporting while omitting some modules
@@ -74,16 +74,16 @@ class SummaryTest(CoverageTest):
self.run_command("coverage -x mycode.py")
report = self.report_from_command("coverage -r -o %s" % prefix)
- # Name Stmts Exec Cover
+ # Name Stmts Miss Cover
# ----------------------------
- # mycode 4 4 100%
+ # mycode 4 0 100%
self.assertEqual(self.line_count(report), 3)
self.assertFalse("/coverage/" in report)
self.assertFalse("/test/modules/covmod1 " in report)
self.assertFalse("/test/zipmods.zip/covmodzip1 " in report)
self.assertTrue("mycode " in report)
- self.assertEqual(self.last_line_squeezed(report), "mycode 4 4 100%")
+ self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
def test_report_branches(self):
self.make_file("mybranch.py", """\
@@ -97,11 +97,11 @@ class SummaryTest(CoverageTest):
self.assertEqual(out, 'x\n')
report = self.report_from_command("coverage report")
- # Name Stmts Exec Branch BrExec Cover
+ # Name Stmts Miss Branch BrPart Cover
# --------------------------------------------
- # mybranch 5 5 2 1 85%
+ # mybranch 5 0 2 1 85%
self.assertEqual(self.line_count(report), 3)
self.assertTrue("mybranch " in report)
self.assertEqual(self.last_line_squeezed(report),
- "mybranch 5 5 2 1 85%")
+ "mybranch 5 0 2 1 85%")
View Lorry Controller Status