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

Unified Diff: update-copyright/tests/test_update_copyright.py

Issue 29493601: Issue 5431 - Fix test for copyright update script (Closed) Base URL: https://hg.adblockplus.org/codingtools
Patch Set: Create sample_file from tmpdir_factory Created Aug. 3, 2017, 6:20 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« patchconv/README.md ('K') | « update-copyright/tests/data/sample_file.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: update-copyright/tests/test_update_copyright.py
===================================================================
--- a/update-copyright/tests/test_update_copyright.py
+++ b/update-copyright/tests/test_update_copyright.py
@@ -9,83 +9,93 @@
import pytest
from update_copyright import extract_urls, text_replace, hg_commit, main
data_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
-def create_repo(path):
+@pytest.fixture(scope='session')
+def sample_file(tmpdir_factory):
+ text = '# {}right (C) 2006-2015 eyeo GmbH\n'.format('Copy')
+ text += "value = '{}right (C) 2006-2016 Eyeo GmbH'\n".format('Copy')
+ text += '# {}right (C) 2006-2014 example GmbH'.format('Copy')
+ sample_file = tmpdir_factory.mktemp('sample_dir').join('sample_file.py')
+ with open(str(sample_file), 'w') as sample_file_path:
Vasily Kuznetsov 2017/08/04 16:54:46 Since now `sample_file` is a `py.path` object, you
rosie 2017/08/05 18:41:07 Done.
+ sample_file_path.write(text)
+ return str(sample_file)
+
+
+def create_repo(sample_file, path):
subprocess.check_call(['hg', 'init', path])
with open(os.path.join(path, '.hg', 'hgrc'), 'w+') as hgrc:
set_user = '[ui]\nusername = Test User <test@example.com>'
hgrc.write(set_user)
- shutil.copy(os.path.join(data_path, 'sample_file.py'), path)
+ shutil.copy(sample_file, path)
subprocess.check_call(['hg', 'commit', '-Am', 'Initial commit',
'--repository', path])
@pytest.fixture()
def temp_dir(tmpdir):
temp_dir = tmpdir.mkdir('temp_dir')
return temp_dir
@pytest.fixture()
-def temp_repo(tmpdir):
+def temp_repo(sample_file, tmpdir):
""""Returns a path to a temporary repo containing one sample file"""
temp_repo = tmpdir.mkdir('tmp_dir')
- create_repo(str(temp_repo))
+ create_repo(sample_file, str(temp_repo))
return temp_repo
@pytest.fixture()
-def base_dir(tmpdir):
+def base_dir(sample_file, tmpdir):
"""Returns a temporary directory that contains one html page and two
repositories (one with push access, the other without)"""
tmp_repo = tmpdir.mkdir('tmp_dir')
temp_dir = str(tmp_repo)
subprocess.check_call(['cp', os.path.join(data_path, 'hg_page.html'),
temp_dir])
repo_1 = os.path.join(temp_dir, 'repo_1')
repo_2 = os.path.join(temp_dir, 'repo_2')
os.mkdir(repo_1)
os.mkdir(repo_2)
- create_repo(repo_1)
- create_repo(repo_2)
+ create_repo(sample_file, repo_1)
+ create_repo(sample_file, repo_2)
# Make repo_2 read-only
with open(os.path.join(repo_2, '.hg/hgrc'), 'w') as hgrc:
hook = '[hooks]\npretxnchangegroup = return True'
hgrc.write(hook)
return temp_dir
def test_extract_urls():
data_url = urllib.parse.urljoin('file:///', data_path)
urls = [data_url + '/repo_1/',
data_url + '/repo_2/']
assert urls == extract_urls(os.path.join(data_url, 'hg_page.html'))
-def test_text_replacement(temp_repo):
+def test_text_replacement(sample_file, temp_repo):
updated = 0
- filename = temp_repo.join('sample_file.py').strpath
- text_replace(temp_repo.strpath, filename)
- with open(filename) as file:
+ text_replace(temp_repo.strpath, 'sample_file.py')
+ with open(os.path.join(temp_repo.strpath, 'sample_file.py')) as file:
text = file.read()
pattern = re.compile(r'(copyright.*?\d{4})(?:-\d{4})?\s+eyeo gmbh',
re.I)
for year in re.finditer(pattern, text):
dates = re.search(r'(\d{4})-(\d{4})', year.group(0))
if dates.group(2) == str(datetime.datetime.now().year):
updated += 1
- # test that non-eyeo copyright information are left alone
+ # test that non-eyeo copyright information is left alone
assert '2014 example' in text
# test for copyright information in both strings and comments
assert updated == 2
def test_hg_commit(temp_repo, temp_dir):
directory = str(temp_dir)
repo = str(temp_repo)
@@ -95,17 +105,21 @@
hg_commit(directory, repo)
# Make sure both files contain the commmit message from hg log
log_1 = subprocess.run(['hg', 'log', '--repository', repo],
stdout=subprocess.PIPE)
assert 'Noissue - Updated copyright year' in str(log_1.stdout)
-def test_all(base_dir):
+def test_all(sample_file, base_dir):
+ # Copy the sample_file to both repos
+ shutil.copy(sample_file, os.path.join(base_dir, 'repo_1'))
Vasily Kuznetsov 2017/08/04 16:54:46 Isn't the sample file already copied to the reposi
rosie 2017/08/05 18:41:08 Done.
+ shutil.copy(sample_file, os.path.join(base_dir, 'repo_2'))
+
main(urllib.parse.urljoin('file:///', os.path.join(
base_dir, 'hg_page.html')), None)
# assert hg log for repo_1
log_1 = subprocess.run(['hg', 'log', '--repository',
os.path.join(base_dir, 'repo_1')],
stdout=subprocess.PIPE)
assert 'Noissue - Updated copyright year' in str(log_1.stdout)
« patchconv/README.md ('K') | « update-copyright/tests/data/sample_file.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld