From c7e2de351f449132aac34228a9619b8f65360e0f Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 22 Aug 2018 12:01:34 -0400 Subject: Remove needless license lines from html tests --- tests/farm/html/gold_a/a_py.html | 28 ++---- tests/farm/html/gold_a/index.html | 2 +- tests/farm/html/gold_b_branch/b_py.html | 100 ++++++++++----------- tests/farm/html/gold_b_branch/index.html | 2 +- tests/farm/html/gold_bom/bom_py.html | 44 ++++----- tests/farm/html/gold_bom/index.html | 2 +- tests/farm/html/gold_isolatin1/index.html | 2 +- tests/farm/html/gold_isolatin1/isolatin1_py.html | 20 ++--- tests/farm/html/gold_omit_1/index.html | 2 +- tests/farm/html/gold_omit_1/m1_py.html | 16 ++-- tests/farm/html/gold_omit_1/m2_py.html | 16 ++-- tests/farm/html/gold_omit_1/m3_py.html | 16 ++-- tests/farm/html/gold_omit_1/main_py.html | 36 ++++---- tests/farm/html/gold_omit_2/index.html | 2 +- tests/farm/html/gold_omit_2/m2_py.html | 16 ++-- tests/farm/html/gold_omit_2/m3_py.html | 16 ++-- tests/farm/html/gold_omit_2/main_py.html | 36 ++++---- tests/farm/html/gold_omit_3/index.html | 2 +- tests/farm/html/gold_omit_3/m3_py.html | 16 ++-- tests/farm/html/gold_omit_3/main_py.html | 36 ++++---- tests/farm/html/gold_omit_4/index.html | 2 +- tests/farm/html/gold_omit_4/m1_py.html | 16 ++-- tests/farm/html/gold_omit_4/m3_py.html | 16 ++-- tests/farm/html/gold_omit_4/main_py.html | 36 ++++---- tests/farm/html/gold_omit_5/index.html | 2 +- tests/farm/html/gold_omit_5/m1_py.html | 16 ++-- tests/farm/html/gold_omit_5/main_py.html | 36 ++++---- tests/farm/html/gold_other/blah_blah_other_py.html | 20 ++--- tests/farm/html/gold_other/here_py.html | 32 +++---- tests/farm/html/gold_other/index.html | 4 +- tests/farm/html/gold_partial/index.html | 2 +- tests/farm/html/gold_partial/partial_py.html | 74 +++++++-------- tests/farm/html/gold_styled/a_py.html | 28 ++---- tests/farm/html/gold_styled/index.html | 2 +- tests/farm/html/gold_unicode/index.html | 2 +- tests/farm/html/gold_unicode/unicode_py.html | 20 ++--- tests/test_html.py | 90 +++++-------------- 37 files changed, 301 insertions(+), 507 deletions(-) (limited to 'tests') diff --git a/tests/farm/html/gold_a/a_py.html b/tests/farm/html/gold_a/a_py.html index 52c09526..b90583bc 100644 --- a/tests/farm/html/gold_a/a_py.html +++ b/tests/farm/html/gold_a/a_py.html @@ -54,28 +54,18 @@
-

1

+

1

2

-

3

+

3

4

-

5

-

6

-

7

-

8

-

9

-

10

+

5

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

# A test file for HTML reporting by coverage.py. 

-

 

-

if 1 < 2: 

-

# Needed a < to look at HTML entities. 

-

a = 3 

-

else: 

-

a = 4 

+

if 1 < 2: 

+

# Needed a < to look at HTML entities. 

+

a = 3 

+

else: 

+

a = 4 
@@ -84,7 +74,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:45 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_a/index.html b/tests/farm/html/gold_a/index.html index e52d49b4..adcda2d6 100644 --- a/tests/farm/html/gold_a/index.html +++ b/tests/farm/html/gold_a/index.html @@ -76,7 +76,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:45 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_b_branch/b_py.html b/tests/farm/html/gold_b_branch/b_py.html index 6c3f75a8..07250e15 100644 --- a/tests/farm/html/gold_b_branch/b_py.html +++ b/tests/farm/html/gold_b_branch/b_py.html @@ -55,72 +55,62 @@
-

1

+

1

2

-

3

-

4

+

3

+

4

5

-

6

+

6

7

-

8

-

9

-

10

-

11

-

12

+

8

+

9

+

10

+

11

+

12

13

14

15

16

-

17

+

17

18

19

-

20

-

21

-

22

-

23

-

24

-

25

-

26

-

27

-

28

-

29

-

30

-

31

-

32

+

20

+

21

+

22

+

23

+

24

+

25

+

26

+

27

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

# A test file for HTML reporting by coverage.py. 

-

 

-

def one(x): 

-

# This will be a branch that misses the else. 

-

8 ↛ 11line 8 didn't jump to line 11, because the condition on line 8 was never false if x < 2: 

-

a = 3 

-

else: 

-

a = 4 

-

 

-

one(1) 

+

def one(x): 

+

# This will be a branch that misses the else. 

+

3 ↛ 6line 3 didn't jump to line 6, because the condition on line 3 was never false if x < 2: 

+

a = 3 

+

else: 

+

a = 4 

+

 

+

one(1) 

+

 

+

def two(x): 

+

# A missed else that branches to "exit" 

+

12 ↛ exitline 12 didn't return from function 'two', because the condition on line 12 was never false if x: 

+

a = 5 

 

-

def two(x): 

-

# A missed else that branches to "exit" 

-

17 ↛ exitline 17 didn't return from function 'two', because the condition on line 17 was never false if x: 

-

a = 5 

-

 

-

two(1) 

-

 

-

def three(): 

-

try: 

-

# This if has two branches, *neither* one taken. 

-

25 ↛ 26,   25 ↛ 282 missed branches: 1) line 25 didn't jump to line 26, because the condition on line 25 was never true, 2) line 25 didn't jump to line 28, because the condition on line 25 was never false if name_error_this_variable_doesnt_exist: 

-

a = 1 

-

else: 

-

a = 2 

-

except: 

-

pass 

-

 

-

three() 

+

two(1) 

+

 

+

def three(): 

+

try: 

+

# This if has two branches, *neither* one taken. 

+

20 ↛ 21,   20 ↛ 232 missed branches: 1) line 20 didn't jump to line 21, because the condition on line 20 was never true, 2) line 20 didn't jump to line 23, because the condition on line 20 was never false if name_error_this_variable_doesnt_exist: 

+

a = 1 

+

else: 

+

a = 2 

+

except: 

+

pass 

+

 

+

three() 
@@ -129,7 +119,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:40 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_b_branch/index.html b/tests/farm/html/gold_b_branch/index.html index 844f79e1..05f882bf 100644 --- a/tests/farm/html/gold_b_branch/index.html +++ b/tests/farm/html/gold_b_branch/index.html @@ -84,7 +84,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:40 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_bom/bom_py.html b/tests/farm/html/gold_bom/bom_py.html index 472f655b..92e609f8 100644 --- a/tests/farm/html/gold_bom/bom_py.html +++ b/tests/farm/html/gold_bom/bom_py.html @@ -55,35 +55,29 @@

1

-

2

+

2

3

-

4

-

5

-

6

+

4

+

5

+

6

7

-

8

-

9

-

10

-

11

-

12

-

13

-

14

+

8

+

9

+

10

+

11

-

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

+

# A Python source file in utf-8, with BOM. 

+

math = "3×4 = 12, ÷2 = 6±0" 

 

-

# A Python source file in utf-8, with BOM. 

-

math = "3×4 = 12, ÷2 = 6±0" 

-

 

-

import sys 

-

 

-

if sys.version_info >= (3, 0): 

-

assert len(math) == 18 

-

assert len(math.encode('utf-8')) == 21 

-

else: 

-

assert len(math) == 21 

-

assert len(math.decode('utf-8')) == 18 

+

import sys 

+

 

+

if sys.version_info >= (3, 0): 

+

assert len(math) == 18 

+

assert len(math.encode('utf-8')) == 21 

+

else: 

+

assert len(math) == 21 

+

assert len(math.decode('utf-8')) == 18 

@@ -92,7 +86,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:44 + created at 2018-08-22 20:00

diff --git a/tests/farm/html/gold_bom/index.html b/tests/farm/html/gold_bom/index.html index 0341c0d0..13c55bf6 100644 --- a/tests/farm/html/gold_bom/index.html +++ b/tests/farm/html/gold_bom/index.html @@ -76,7 +76,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:44 + created at 2018-08-22 20:00

diff --git a/tests/farm/html/gold_isolatin1/index.html b/tests/farm/html/gold_isolatin1/index.html index ec125364..160efcb6 100644 --- a/tests/farm/html/gold_isolatin1/index.html +++ b/tests/farm/html/gold_isolatin1/index.html @@ -76,7 +76,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:40 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_isolatin1/isolatin1_py.html b/tests/farm/html/gold_isolatin1/isolatin1_py.html index 45d13f42..02e0ac0a 100644 --- a/tests/farm/html/gold_isolatin1/isolatin1_py.html +++ b/tests/farm/html/gold_isolatin1/isolatin1_py.html @@ -57,21 +57,15 @@

1

2

3

-

4

-

5

-

6

-

7

-

8

+

4

+

5

# -*- coding: iso8859-1 -*- 

-

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

# A Python source file in another encoding. 

-

 

-

math = "3×4 = 12, ÷2 = 6±0" 

-

assert len(math) == 18 

+

# A Python source file in another encoding. 

+

 

+

math = "3×4 = 12, ÷2 = 6±0" 

+

assert len(math) == 18 

@@ -80,7 +74,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:40 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_1/index.html b/tests/farm/html/gold_omit_1/index.html index 9ea591a4..95356e06 100644 --- a/tests/farm/html/gold_omit_1/index.html +++ b/tests/farm/html/gold_omit_1/index.html @@ -97,7 +97,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_1/m1_py.html b/tests/farm/html/gold_omit_1/m1_py.html index 1557156c..9ea4648e 100644 --- a/tests/farm/html/gold_omit_1/m1_py.html +++ b/tests/farm/html/gold_omit_1/m1_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m1a = 1 

-

m1b = 2 

+

m1a = 1 

+

m1b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_1/m2_py.html b/tests/farm/html/gold_omit_1/m2_py.html index 8f3102d1..d6647ac0 100644 --- a/tests/farm/html/gold_omit_1/m2_py.html +++ b/tests/farm/html/gold_omit_1/m2_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m2a = 1 

-

m2b = 2 

+

m2a = 1 

+

m2b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_1/m3_py.html b/tests/farm/html/gold_omit_1/m3_py.html index 2d1e1d4c..e5a9ebf7 100644 --- a/tests/farm/html/gold_omit_1/m3_py.html +++ b/tests/farm/html/gold_omit_1/m3_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m3a = 1 

-

m3b = 2 

+

m3a = 1 

+

m3b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_1/main_py.html b/tests/farm/html/gold_omit_1/main_py.html index bc93b1a0..cc763094 100644 --- a/tests/farm/html/gold_omit_1/main_py.html +++ b/tests/farm/html/gold_omit_1/main_py.html @@ -54,34 +54,28 @@
-

1

-

2

-

3

-

4

+

1

+

2

+

3

+

4

5

6

7

8

9

-

10

-

11

-

12

-

13

+

10

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

import m1 

-

import m2 

-

import m3 

+

import m1 

+

import m2 

+

import m3 

+

 

+

a = 5 

+

b = 6 

 

-

a = 5 

-

b = 6 

-

 

-

assert m1.m1a == 1 

-

assert m2.m2a == 1 

-

assert m3.m3a == 1 

+

assert m1.m1a == 1 

+

assert m2.m2a == 1 

+

assert m3.m3a == 1 
@@ -90,7 +84,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_2/index.html b/tests/farm/html/gold_omit_2/index.html index 8c2576f2..5e78cd3a 100644 --- a/tests/farm/html/gold_omit_2/index.html +++ b/tests/farm/html/gold_omit_2/index.html @@ -90,7 +90,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_2/m2_py.html b/tests/farm/html/gold_omit_2/m2_py.html index 8f3102d1..d6647ac0 100644 --- a/tests/farm/html/gold_omit_2/m2_py.html +++ b/tests/farm/html/gold_omit_2/m2_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m2a = 1 

-

m2b = 2 

+

m2a = 1 

+

m2b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_2/m3_py.html b/tests/farm/html/gold_omit_2/m3_py.html index 2d1e1d4c..e5a9ebf7 100644 --- a/tests/farm/html/gold_omit_2/m3_py.html +++ b/tests/farm/html/gold_omit_2/m3_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m3a = 1 

-

m3b = 2 

+

m3a = 1 

+

m3b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_2/main_py.html b/tests/farm/html/gold_omit_2/main_py.html index bc93b1a0..cc763094 100644 --- a/tests/farm/html/gold_omit_2/main_py.html +++ b/tests/farm/html/gold_omit_2/main_py.html @@ -54,34 +54,28 @@
-

1

-

2

-

3

-

4

+

1

+

2

+

3

+

4

5

6

7

8

9

-

10

-

11

-

12

-

13

+

10

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

import m1 

-

import m2 

-

import m3 

+

import m1 

+

import m2 

+

import m3 

+

 

+

a = 5 

+

b = 6 

 

-

a = 5 

-

b = 6 

-

 

-

assert m1.m1a == 1 

-

assert m2.m2a == 1 

-

assert m3.m3a == 1 

+

assert m1.m1a == 1 

+

assert m2.m2a == 1 

+

assert m3.m3a == 1 
@@ -90,7 +84,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_3/index.html b/tests/farm/html/gold_omit_3/index.html index f0b32cc4..5c03fb8f 100644 --- a/tests/farm/html/gold_omit_3/index.html +++ b/tests/farm/html/gold_omit_3/index.html @@ -83,7 +83,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_3/m3_py.html b/tests/farm/html/gold_omit_3/m3_py.html index 2d1e1d4c..e5a9ebf7 100644 --- a/tests/farm/html/gold_omit_3/m3_py.html +++ b/tests/farm/html/gold_omit_3/m3_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m3a = 1 

-

m3b = 2 

+

m3a = 1 

+

m3b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_3/main_py.html b/tests/farm/html/gold_omit_3/main_py.html index bc93b1a0..cc763094 100644 --- a/tests/farm/html/gold_omit_3/main_py.html +++ b/tests/farm/html/gold_omit_3/main_py.html @@ -54,34 +54,28 @@
-

1

-

2

-

3

-

4

+

1

+

2

+

3

+

4

5

6

7

8

9

-

10

-

11

-

12

-

13

+

10

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

import m1 

-

import m2 

-

import m3 

+

import m1 

+

import m2 

+

import m3 

+

 

+

a = 5 

+

b = 6 

 

-

a = 5 

-

b = 6 

-

 

-

assert m1.m1a == 1 

-

assert m2.m2a == 1 

-

assert m3.m3a == 1 

+

assert m1.m1a == 1 

+

assert m2.m2a == 1 

+

assert m3.m3a == 1 
@@ -90,7 +84,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_4/index.html b/tests/farm/html/gold_omit_4/index.html index 7dadd229..13c4ab69 100644 --- a/tests/farm/html/gold_omit_4/index.html +++ b/tests/farm/html/gold_omit_4/index.html @@ -90,7 +90,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_4/m1_py.html b/tests/farm/html/gold_omit_4/m1_py.html index 1557156c..9ea4648e 100644 --- a/tests/farm/html/gold_omit_4/m1_py.html +++ b/tests/farm/html/gold_omit_4/m1_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m1a = 1 

-

m1b = 2 

+

m1a = 1 

+

m1b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_4/m3_py.html b/tests/farm/html/gold_omit_4/m3_py.html index 2d1e1d4c..e5a9ebf7 100644 --- a/tests/farm/html/gold_omit_4/m3_py.html +++ b/tests/farm/html/gold_omit_4/m3_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m3a = 1 

-

m3b = 2 

+

m3a = 1 

+

m3b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_4/main_py.html b/tests/farm/html/gold_omit_4/main_py.html index bc93b1a0..cc763094 100644 --- a/tests/farm/html/gold_omit_4/main_py.html +++ b/tests/farm/html/gold_omit_4/main_py.html @@ -54,34 +54,28 @@
-

1

-

2

-

3

-

4

+

1

+

2

+

3

+

4

5

6

7

8

9

-

10

-

11

-

12

-

13

+

10

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

import m1 

-

import m2 

-

import m3 

+

import m1 

+

import m2 

+

import m3 

+

 

+

a = 5 

+

b = 6 

 

-

a = 5 

-

b = 6 

-

 

-

assert m1.m1a == 1 

-

assert m2.m2a == 1 

-

assert m3.m3a == 1 

+

assert m1.m1a == 1 

+

assert m2.m2a == 1 

+

assert m3.m3a == 1 
@@ -90,7 +84,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_5/index.html b/tests/farm/html/gold_omit_5/index.html index b9912d24..366b1b8b 100644 --- a/tests/farm/html/gold_omit_5/index.html +++ b/tests/farm/html/gold_omit_5/index.html @@ -83,7 +83,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_5/m1_py.html b/tests/farm/html/gold_omit_5/m1_py.html index 1557156c..9ea4648e 100644 --- a/tests/farm/html/gold_omit_5/m1_py.html +++ b/tests/farm/html/gold_omit_5/m1_py.html @@ -54,18 +54,12 @@
-

1

-

2

-

3

-

4

-

5

+

1

+

2

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

m1a = 1 

-

m1b = 2 

+

m1a = 1 

+

m1b = 2 
@@ -74,7 +68,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_omit_5/main_py.html b/tests/farm/html/gold_omit_5/main_py.html index bc93b1a0..cc763094 100644 --- a/tests/farm/html/gold_omit_5/main_py.html +++ b/tests/farm/html/gold_omit_5/main_py.html @@ -54,34 +54,28 @@
-

1

-

2

-

3

-

4

+

1

+

2

+

3

+

4

5

6

7

8

9

-

10

-

11

-

12

-

13

+

10

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

import m1 

-

import m2 

-

import m3 

+

import m1 

+

import m2 

+

import m3 

+

 

+

a = 5 

+

b = 6 

 

-

a = 5 

-

b = 6 

-

 

-

assert m1.m1a == 1 

-

assert m2.m2a == 1 

-

assert m3.m3a == 1 

+

assert m1.m1a == 1 

+

assert m2.m2a == 1 

+

assert m3.m3a == 1 
@@ -90,7 +84,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_other/blah_blah_other_py.html b/tests/farm/html/gold_other/blah_blah_other_py.html index fb45d0bf..4d083808 100644 --- a/tests/farm/html/gold_other/blah_blah_other_py.html +++ b/tests/farm/html/gold_other/blah_blah_other_py.html @@ -3,7 +3,7 @@ - Coverage for /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py: 100% + Coverage for /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_42705243/othersrc/other.py: 100% @@ -16,7 +16,7 @@ diff --git a/tests/farm/html/gold_other/index.html b/tests/farm/html/gold_other/index.html index a9c3d4cb..18edab71 100644 --- a/tests/farm/html/gold_other/index.html +++ b/tests/farm/html/gold_other/index.html @@ -60,7 +60,7 @@ - /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py + /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_42705243/othersrc/other.py 1 0 0 @@ -83,7 +83,7 @@

coverage.py v5.0a2, - created at 2018-08-22 19:08 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_partial/index.html b/tests/farm/html/gold_partial/index.html index ca8919d7..b0addf9c 100644 --- a/tests/farm/html/gold_partial/index.html +++ b/tests/farm/html/gold_partial/index.html @@ -84,7 +84,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_partial/partial_py.html b/tests/farm/html/gold_partial/partial_py.html index 7f4ed31a..c792ff75 100644 --- a/tests/farm/html/gold_partial/partial_py.html +++ b/tests/farm/html/gold_partial/partial_py.html @@ -56,55 +56,47 @@

1

-

2

+

2

3

-

4

-

5

-

6

-

7

+

4

+

5

+

6

+

7

8

-

9

-

10

+

9

+

10

11

-

12

+

12

13

-

14

-

15

+

14

+

15

16

-

17

+

17

18

-

19

-

20

-

21

-

22

-

23

-

24

+

19

+

20

-

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

+

# partial branches and excluded lines 

+

a = 6 

 

-

# partial branches and excluded lines 

-

 

-

a = 6 

-

 

-

while True: 

-

break 

-

 

-

while 1: 

-

break 

-

 

-

while a: # pragma: no branch 

-

break 

-

 

-

if 0: 

-

never_happen() 

-

 

-

if 1: 

-

a = 21 

-

 

-

if a == 23: 

-

raise AssertionError("Can't") 

+

while True: 

+

break 

+

 

+

while 1: 

+

break 

+

 

+

while a: # pragma: no branch 

+

break 

+

 

+

if 0: 

+

never_happen() 

+

 

+

if 1: 

+

a = 21 

+

 

+

if a == 23: 

+

raise AssertionError("Can't") 

@@ -113,7 +105,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:43 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_styled/a_py.html b/tests/farm/html/gold_styled/a_py.html index 6e6f317c..65f35d6e 100644 --- a/tests/farm/html/gold_styled/a_py.html +++ b/tests/farm/html/gold_styled/a_py.html @@ -55,28 +55,18 @@
-

1

+

1

2

-

3

+

3

4

-

5

-

6

-

7

-

8

-

9

-

10

+

5

 -

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

# A test file for HTML reporting by coverage.py. 

-

 

-

if 1 < 2: 

-

# Needed a < to look at HTML entities. 

-

a = 3 

-

else: 

-

a = 4 

+

if 1 < 2: 

+

# Needed a < to look at HTML entities. 

+

a = 3 

+

else: 

+

a = 4 
@@ -85,7 +75,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:42 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_styled/index.html b/tests/farm/html/gold_styled/index.html index c0881592..e5c36b95 100644 --- a/tests/farm/html/gold_styled/index.html +++ b/tests/farm/html/gold_styled/index.html @@ -77,7 +77,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:42 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_unicode/index.html b/tests/farm/html/gold_unicode/index.html index c1f2fb67..ff722dc9 100644 --- a/tests/farm/html/gold_unicode/index.html +++ b/tests/farm/html/gold_unicode/index.html @@ -76,7 +76,7 @@

coverage.py v5.0a2, - created at 2018-06-29 15:42 + created at 2018-08-22 19:42

diff --git a/tests/farm/html/gold_unicode/unicode_py.html b/tests/farm/html/gold_unicode/unicode_py.html index 7708f22e..8207d798 100644 --- a/tests/farm/html/gold_unicode/unicode_py.html +++ b/tests/farm/html/gold_unicode/unicode_py.html @@ -57,21 +57,15 @@

1

2

3

-

4

-

5

-

6

-

7

-

8

+

4

+

5

# -*- coding: utf-8 -*- 

-

# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 

-

# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt 

-

 

-

# A Python source file with exotic characters. 

-

 

-

upside_down = "ʎd˙ǝbɐɹǝʌoɔ" 

-

surrogate = "db40,dd00: x󠄀" 

+

# A Python source file with exotic characters. 

+

 

+

upside_down = "ʎd˙ǝbɐɹǝʌoɔ" 

+

surrogate = "db40,dd00: x󠄀" 

@@ -80,7 +74,7 @@

« index     coverage.py v5.0a2, - created at 2018-06-29 15:42 + created at 2018-08-22 19:42

diff --git a/tests/test_html.py b/tests/test_html.py index 07ddba82..b4dd4606 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -596,11 +596,6 @@ class HtmlGoldTests(CoverageTest): def test_a(self): self.make_file("a.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - - # A test file for HTML reporting by coverage.py. - if 1 < 2: # Needed a < to look at HTML entities. a = 3 @@ -632,11 +627,6 @@ class HtmlGoldTests(CoverageTest): def test_b_branch(self): self.make_file("b.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - - # A test file for HTML reporting by coverage.py. - def one(x): # This will be a branch that misses the else. if x < 2: @@ -680,19 +670,20 @@ class HtmlGoldTests(CoverageTest): (' a = ' '3'), '70%', - ('8 ↛ 11' - 'line 8 didn\'t jump to line 11, ' - 'because the condition on line 8 was never false'), - ('17 ↛ exit' - 'line 17 didn\'t return from function \'two\', ' - 'because the condition on line 17 was never false'), - ('25 ↛ 26,   ' - '25 ↛ 28' + + ('3 ↛ 6' + 'line 3 didn\'t jump to line 6, ' + 'because the condition on line 3 was never false'), + ('12 ↛ exit' + 'line 12 didn\'t return from function \'two\', ' + 'because the condition on line 12 was never false'), + ('20 ↛ 21,   ' + '20 ↛ 23' '2 missed branches: ' - '1) line 25 didn\'t jump to line 26, ' - 'because the condition on line 25 was never true, ' - '2) line 25 didn\'t jump to line 28, ' - 'because the condition on line 25 was never false'), + '1) line 20 didn\'t jump to line 21, ' + 'because the condition on line 20 was never true, ' + '2) line 20 didn\'t jump to line 23, ' + 'because the condition on line 20 was never false'), ) contains( "out/index.html", @@ -703,10 +694,7 @@ class HtmlGoldTests(CoverageTest): def test_bom(self): self.make_file("bom.py", bytes=b"""\ -\xef\xbb\xbf# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 -# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - -# A Python source file in utf-8, with BOM. +\xef\xbb\xbf# A Python source file in utf-8, with BOM. math = "3\xc3\x974 = 12, \xc3\xb72 = 6\xc2\xb10" import sys @@ -725,7 +713,7 @@ else: with open("bom.py", "rb") as f: data = f.read() assert data[:3] == b"\xef\xbb\xbf" - assert data.count(b"\r\n") == 14 + assert data.count(b"\r\n") == 11 cov = coverage.Coverage() cov.start() @@ -742,9 +730,6 @@ else: def test_isolatin1(self): self.make_file("isolatin1.py", bytes=b"""\ # -*- coding: iso8859-1 -*- -# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 -# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - # A Python source file in another encoding. math = "3\xd74 = 12, \xf72 = 6\xb10" @@ -765,9 +750,6 @@ assert len(math) == 18 def make_main_etc(self): self.make_file("main.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - import m1 import m2 import m3 @@ -780,23 +762,14 @@ assert len(math) == 18 assert m3.m3a == 1 """) self.make_file("m1.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - m1a = 1 m1b = 2 """) self.make_file("m2.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - m2a = 1 m2b = 2 """) self.make_file("m3.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - m3a = 1 m3b = 2 """) @@ -872,11 +845,6 @@ assert len(math) == 18 def test_other(self): self.make_file("src/here.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - - # A test file for HTML reporting by coverage.py. - import other if 1 < 2: @@ -885,9 +853,6 @@ assert len(math) == 18 h = 4 """) self.make_file("othersrc/other.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - # A file in another directory. We're checking that it ends up in the # HTML report. @@ -916,11 +881,7 @@ assert len(math) == 18 def test_partial(self): self.make_file("partial.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - # partial branches and excluded lines - a = 6 while True: @@ -942,9 +903,6 @@ assert len(math) == 18 raise AssertionError("Can't") """) self.make_file("partial.ini", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - [run] branch = True @@ -962,13 +920,13 @@ assert len(math) == 18 compare_html("out", gold_path("html/gold_partial")) contains( "out/partial_py.html", - '

', - '

', - '

', + '

', + '

', + '

', # The "if 0" and "if 1" statements are optimized away. - '

', + '

', # The "raise AssertionError" is excluded by regex in the .ini. - '

', + '

', ) contains( "out/index.html", @@ -981,11 +939,6 @@ assert len(math) == 18 def test_styled(self): self.make_file("a.py", """\ - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - - # A test file for HTML reporting by coverage.py. - if 1 < 2: # Needed a < to look at HTML entities. a = 3 @@ -1058,9 +1011,6 @@ assert len(math) == 18 def test_unicode(self): self.make_file("unicode.py", """\ # -*- coding: utf-8 -*- - # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 - # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - # A Python source file with exotic characters. upside_down = "ʎd˙ǝbɐɹǝʌoɔ" -- cgit v1.2.1