Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: update-copyright/tests/test_update_copyright.py

Issue 29459580: Issue 5250 - Add copyright update script (Closed) Base URL: https://hg.adblockplus.org/codingtools
Left Patch Set: Addressed comments Created June 23, 2017, 2:36 p.m.
Right Patch Set: Fix indentation and default args Created July 17, 2017, 1:22 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « update-copyright/tests/data/sample_file.py ('k') | update-copyright/tox.ini » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #!/usr/bin/env python3 1 #!/usr/bin/env python3
2 2
3 import os 3 import os
4 import re 4 import re
5 import datetime 5 import datetime
6 import subprocess 6 import subprocess
7 import shutil 7 import shutil
8 import urllib.parse 8 import urllib.parse
9 9
10 import pytest 10 import pytest
(...skipping 24 matching lines...) Expand all
35 """"Returns a path to a temporary repo containing one sample file""" 35 """"Returns a path to a temporary repo containing one sample file"""
36 temp_repo = tmpdir.mkdir('tmp_dir') 36 temp_repo = tmpdir.mkdir('tmp_dir')
37 create_repo(str(temp_repo)) 37 create_repo(str(temp_repo))
38 return temp_repo 38 return temp_repo
39 39
40 40
41 @pytest.fixture() 41 @pytest.fixture()
42 def base_dir(tmpdir): 42 def base_dir(tmpdir):
43 """Returns a temporary directory that contains one html page and two 43 """Returns a temporary directory that contains one html page and two
44 repositories (one with push access, the other without)""" 44 repositories (one with push access, the other without)"""
45 repo = tmpdir.mkdir('tmp_dir') 45 tmp_repo = tmpdir.mkdir('tmp_dir')
46 temp_dir = str(repo) 46 temp_dir = str(tmp_repo)
47 subprocess.check_call(['cp', os.path.join(data_path, 'hg_page.html'), 47 subprocess.check_call(['cp', os.path.join(data_path, 'hg_page.html'),
48 temp_dir]) 48 temp_dir])
49 repo_1 = temp_dir + '/repo_1' 49 repo_1 = os.path.join(temp_dir, 'repo_1')
Vasily Kuznetsov 2017/06/27 16:18:51 Any reason why you're not using `os.path.join` her
rosie 2017/07/03 15:33:44 Done.
rosie 2017/07/03 15:33:44 repo_1 and repo_2 were only needed as strings, so
50 repo_2 = temp_dir + '/repo_2' 50 repo_2 = os.path.join(temp_dir, 'repo_2')
51 subprocess.check_call(['mkdir', repo_1]) 51 os.mkdir(repo_1)
Vasily Kuznetsov 2017/06/27 16:18:51 You can also use `os.mkdir` for this -- simpler th
rosie 2017/07/03 15:33:43 Done.
rosie 2017/07/03 15:33:44 Switched it to `os.mkdir`. The `create_repo` funct
Vasily Kuznetsov 2017/07/03 19:25:45 It looks like the same pattern is followed in the
52 subprocess.check_call(['mkdir', repo_2]) 52 os.mkdir(repo_2)
53 create_repo(repo_1) 53 create_repo(repo_1)
54 create_repo(repo_2) 54 create_repo(repo_2)
55 55
56 # Make repo_2 read-only 56 # Make repo_2 read-only
57 subprocess.check_call(['touch', os.path.join(repo_2, '.hg/hgrc')])
Vasily Kuznetsov 2017/06/27 16:18:51 Do we actually need to touch `hgrc` before we writ
rosie 2017/07/03 15:33:43 Done.
58 with open(os.path.join(repo_2, '.hg/hgrc'), 'w') as hgrc: 57 with open(os.path.join(repo_2, '.hg/hgrc'), 'w') as hgrc:
59 hook = '[hooks]\npretxnchangegroup = return True' 58 hook = '[hooks]\npretxnchangegroup = return True'
60 hgrc.write(hook) 59 hgrc.write(hook)
61 return repo 60 return temp_dir
62 61
63 62
64 def test_extract_urls(): 63 def test_extract_urls():
65 data_url = urllib.parse.urljoin('file:///', data_path) 64 data_url = urllib.parse.urljoin('file:///', data_path)
66 urls = [os.path.join(data_url + '/repo_1/'), 65 urls = [data_url + '/repo_1/',
Vasily Kuznetsov 2017/06/27 16:18:51 Seems like we're passing only one argument to `os.
rosie 2017/07/03 15:33:44 Done.
67 os.path.join(data_url + '/repo_2/')] 66 data_url + '/repo_2/']
68 assert urls == extract_urls(os.path.join(data_url, 'hg_page.html')) 67 assert urls == extract_urls(os.path.join(data_url, 'hg_page.html'))
69 68
70 69
71 def test_text_replacement(temp_repo): 70 def test_text_replacement(temp_repo):
71 updated = 0
72 filename = temp_repo.join('sample_file.py').strpath 72 filename = temp_repo.join('sample_file.py').strpath
73 text_replace(temp_repo.strpath, filename) 73 text_replace(temp_repo.strpath, filename)
74 with open(filename) as file: 74 with open(filename) as file:
75 text = file.read() 75 text = file.read()
76 pattern = re.compile(r'(copyright.*?\d{4})(?:-\d{4})?\s+eyeo gmbh', 76 pattern = re.compile(r'(copyright.*?\d{4})(?:-\d{4})?\s+eyeo gmbh',
77 re.I) 77 re.I)
78 for year in re.finditer(pattern, text): 78 for year in re.finditer(pattern, text):
79 dates = re.search(r'(\d{4})-(\d{4})', year.group(0)) 79 dates = re.search(r'(\d{4})-(\d{4})', year.group(0))
80 assert dates.group(2) == str(datetime.datetime.now().year) 80 if dates.group(2) == str(datetime.datetime.now().year):
81 updated += 1
82
83 # test that non-eyeo copyright information are left alone
84 assert '2014 example' in text
85 # test for copyright information in both strings and comments
86 assert updated == 2
81 87
82 88
83 def test_hg_commit(temp_repo, temp_dir): 89 def test_hg_commit(temp_repo, temp_dir):
84 directory = str(temp_dir) 90 directory = str(temp_dir)
85 subprocess.check_call(['hg', 'clone', temp_repo.strpath, directory]) 91 repo = str(temp_repo)
Vasily Kuznetsov 2017/06/27 16:18:51 You could also assign `temp_repo.strpath` to a var
rosie 2017/07/03 15:33:43 Done.
92 subprocess.check_call(['hg', 'clone', repo, directory])
86 open(os.path.join(directory, 'foo'), 'w').close() 93 open(os.path.join(directory, 'foo'), 'w').close()
87 subprocess.check_call(['hg', 'add', '--repository', directory]) 94 subprocess.check_call(['hg', 'add', '--repository', directory])
88 hg_commit(directory, temp_repo.strpath) 95 hg_commit(directory, repo)
89 96
90 # Make sure both files contain the commmit message from hg log 97 # Make sure both files contain the commmit message from hg log
91 log_1 = subprocess.run(['hg', 'log', '--repository', temp_repo.strpath], 98 log_1 = subprocess.run(['hg', 'log', '--repository', repo],
92 stdout=subprocess.PIPE) 99 stdout=subprocess.PIPE)
93 assert 'Noissue - Updated copyright year' in str(log_1.stdout) 100 assert 'Noissue - Updated copyright year' in str(log_1.stdout)
94 101
95 102
96 def test_all(base_dir): 103 def test_all(base_dir):
97 main(urllib.parse.urljoin('file:///', 104 main(urllib.parse.urljoin('file:///', os.path.join(
98 base_dir.join('hg_page.html').strpath), 105 base_dir, 'hg_page.html')), None)
99 base_dir)
100 106
101 # assert hg log for repo_1 107 # assert hg log for repo_1
102 log_1 = subprocess.run(['hg', 'log', '--repository', 108 log_1 = subprocess.run(['hg', 'log', '--repository',
103 base_dir.join('repo_1').strpath], 109 os.path.join(base_dir, 'repo_1')],
104 stdout=subprocess.PIPE) 110 stdout=subprocess.PIPE)
105 assert 'Noissue - Updated copyright year' in str(log_1.stdout) 111 assert 'Noissue - Updated copyright year' in str(log_1.stdout)
106 112
107 # assert the .patch file for repo_2 113 # assert the .patch file for repo_2
108 assert'Noissue - Updated copyright year' in open('repo_2.patch').read() 114 assert'Noissue - Updated copyright year' in open('repo_2.patch').read()
109 subprocess.call(['rm', 'repo_2.patch']) # cleanup 115 subprocess.call(['rm', 'repo_2.patch']) # cleanup
LEFTRIGHT

Powered by Google App Engine
This is Rietveld