diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2009-06-23 22:08:19 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2009-06-23 22:08:19 -0400 |
| commit | 4f5c542411028be233c6c0e35ef23496a5b47282 (patch) | |
| tree | a73890333e7993561cb0e78849c379c3fb592518 /test/farm/annotate | |
| parent | ef82923610fddc367490e4287ee353d14b5fcaae (diff) | |
| download | python-coveragepy-git-4f5c542411028be233c6c0e35ef23496a5b47282.tar.gz | |
Comparing files needs to be agnostic to line endings, or testing on Linux won't work. Now gold files are newline-only, and the comparison function ignores line endings.
Diffstat (limited to 'test/farm/annotate')
| -rw-r--r-- | test/farm/annotate/gold/white.py,cover | 66 | ||||
| -rw-r--r-- | test/farm/annotate/gold_anno_dir/a_a.py,cover | 10 | ||||
| -rw-r--r-- | test/farm/annotate/gold_anno_dir/b_b.py,cover | 4 | ||||
| -rw-r--r-- | test/farm/annotate/gold_anno_dir/multi.py,cover | 10 | ||||
| -rw-r--r-- | test/farm/annotate/gold_multi/a/a.py,cover | 10 | ||||
| -rw-r--r-- | test/farm/annotate/gold_multi/b/b.py,cover | 4 | ||||
| -rw-r--r-- | test/farm/annotate/gold_multi/multi.py,cover | 10 | ||||
| -rw-r--r-- | test/farm/annotate/gold_v24/white.py,cover | 66 |
8 files changed, 90 insertions, 90 deletions
diff --git a/test/farm/annotate/gold/white.py,cover b/test/farm/annotate/gold/white.py,cover index 0287ea9a..36b0b993 100644 --- a/test/farm/annotate/gold/white.py,cover +++ b/test/farm/annotate/gold/white.py,cover @@ -1,33 +1,33 @@ - # A test case sent to me by Steve White
-
-> def f(self):
-! if self==1:
-! pass
-! elif self.m('fred'):
-! pass
-! elif (g==1) and (b==2):
-! pass
-! elif self.m('fred')==True:
-! pass
-! elif ((g==1) and (b==2))==True:
-! pass
-! else:
-! pass
-
-> def g(x):
-> if x == 1:
-> a = 1
-! else:
-! a = 2
-
-> g(1)
-
-> def h(x):
-- if 0: #pragma: no cover
-- pass
-> if x == 1:
-! a = 1
-> else:
-> a = 2
-
-> h(2)
+ # A test case sent to me by Steve White + +> def f(self): +! if self==1: +! pass +! elif self.m('fred'): +! pass +! elif (g==1) and (b==2): +! pass +! elif self.m('fred')==True: +! pass +! elif ((g==1) and (b==2))==True: +! pass +! else: +! pass + +> def g(x): +> if x == 1: +> a = 1 +! else: +! a = 2 + +> g(1) + +> def h(x): +- if 0: #pragma: no cover +- pass +> if x == 1: +! a = 1 +> else: +> a = 2 + +> h(2) diff --git a/test/farm/annotate/gold_anno_dir/a_a.py,cover b/test/farm/annotate/gold_anno_dir/a_a.py,cover index 0c858f41..fb3f5435 100644 --- a/test/farm/annotate/gold_anno_dir/a_a.py,cover +++ b/test/farm/annotate/gold_anno_dir/a_a.py,cover @@ -1,5 +1,5 @@ -> def a(x):
-> if x == 1:
-> print "x is 1"
-! else:
-! print "x is not 1"
+> def a(x): +> if x == 1: +> print "x is 1" +! else: +! print "x is not 1" diff --git a/test/farm/annotate/gold_anno_dir/b_b.py,cover b/test/farm/annotate/gold_anno_dir/b_b.py,cover index 0bd04dac..a3f5daec 100644 --- a/test/farm/annotate/gold_anno_dir/b_b.py,cover +++ b/test/farm/annotate/gold_anno_dir/b_b.py,cover @@ -1,2 +1,2 @@ -> def b(x):
-> print "x is %s" % x
+> def b(x): +> print "x is %s" % x diff --git a/test/farm/annotate/gold_anno_dir/multi.py,cover b/test/farm/annotate/gold_anno_dir/multi.py,cover index fc5b0b79..2a5c59ce 100644 --- a/test/farm/annotate/gold_anno_dir/multi.py,cover +++ b/test/farm/annotate/gold_anno_dir/multi.py,cover @@ -1,5 +1,5 @@ -> import a.a
-> import b.b
-
-> a.a.a(1)
-> b.b.b(2)
+> import a.a +> import b.b + +> a.a.a(1) +> b.b.b(2) diff --git a/test/farm/annotate/gold_multi/a/a.py,cover b/test/farm/annotate/gold_multi/a/a.py,cover index 0c858f41..fb3f5435 100644 --- a/test/farm/annotate/gold_multi/a/a.py,cover +++ b/test/farm/annotate/gold_multi/a/a.py,cover @@ -1,5 +1,5 @@ -> def a(x):
-> if x == 1:
-> print "x is 1"
-! else:
-! print "x is not 1"
+> def a(x): +> if x == 1: +> print "x is 1" +! else: +! print "x is not 1" diff --git a/test/farm/annotate/gold_multi/b/b.py,cover b/test/farm/annotate/gold_multi/b/b.py,cover index 0bd04dac..a3f5daec 100644 --- a/test/farm/annotate/gold_multi/b/b.py,cover +++ b/test/farm/annotate/gold_multi/b/b.py,cover @@ -1,2 +1,2 @@ -> def b(x):
-> print "x is %s" % x
+> def b(x): +> print "x is %s" % x diff --git a/test/farm/annotate/gold_multi/multi.py,cover b/test/farm/annotate/gold_multi/multi.py,cover index fc5b0b79..2a5c59ce 100644 --- a/test/farm/annotate/gold_multi/multi.py,cover +++ b/test/farm/annotate/gold_multi/multi.py,cover @@ -1,5 +1,5 @@ -> import a.a
-> import b.b
-
-> a.a.a(1)
-> b.b.b(2)
+> import a.a +> import b.b + +> a.a.a(1) +> b.b.b(2) diff --git a/test/farm/annotate/gold_v24/white.py,cover b/test/farm/annotate/gold_v24/white.py,cover index 3eca5780..bbd8d428 100644 --- a/test/farm/annotate/gold_v24/white.py,cover +++ b/test/farm/annotate/gold_v24/white.py,cover @@ -1,33 +1,33 @@ - # A test case sent to me by Steve White
-
-> def f(self):
-! if self==1:
-! pass
-! elif self.m('fred'):
-! pass
-! elif (g==1) and (b==2):
-! pass
-! elif self.m('fred')==True:
-! pass
-! elif ((g==1) and (b==2))==True:
-! pass
-> else:
-! pass
-
-> def g(x):
-> if x == 1:
-> a = 1
-! else:
-! a = 2
-
-> g(1)
-
-> def h(x):
-- if 0: #pragma: no cover
-- pass
-> if x == 1:
-! a = 1
-> else:
-> a = 2
-
-> h(2)
+ # A test case sent to me by Steve White + +> def f(self): +! if self==1: +! pass +! elif self.m('fred'): +! pass +! elif (g==1) and (b==2): +! pass +! elif self.m('fred')==True: +! pass +! elif ((g==1) and (b==2))==True: +! pass +> else: +! pass + +> def g(x): +> if x == 1: +> a = 1 +! else: +! a = 2 + +> g(1) + +> def h(x): +- if 0: #pragma: no cover +- pass +> if x == 1: +! a = 1 +> else: +> a = 2 + +> h(2) |