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

Side by Side Diff: sitescripts/extensions/test/utils.py

Issue 29940559: Issue 7112 - Add centralised conftest (Closed)
Patch Set: Addressed comments from Patch Set #2 Created Nov. 14, 2018, 4:58 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sitescripts/extensions/test/conftest.py ('k') | tests/__init__.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-present eyeo GmbH 2 # Copyright (C) 2006-present eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 """ 16 """Fixtures that are useful across test scripts for the extensions module."""
17 Contains fixtures that are useful across test scripts for the extensions module
18 """
19 17
20 import subprocess 18 import subprocess
21 19
22 import pytest 20 import pytest
23 import py 21 import py
24 22
25 23
26 @pytest.fixture(scope='session') 24 @pytest.fixture(scope='session')
27 def tests_dir(): 25 def tests_dir():
28 """Directory that contains this tests and the data files it uses.""" 26 """Directory that contains this tests and the data files it uses."""
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 73
76 74
77 @pytest.fixture() 75 @pytest.fixture()
78 def config_ini(tests_dir, tmpdir, hg_dir, keys_dir): 76 def config_ini(tests_dir, tmpdir, hg_dir, keys_dir):
79 """Sitescripts configuration.""" 77 """Sitescripts configuration."""
80 template = tests_dir.join('sitescripts.ini.template').read() 78 template = tests_dir.join('sitescripts.ini.template').read()
81 conf = template.format(hg_dir=hg_dir, out_dir=tmpdir, keys_dir=keys_dir) 79 conf = template.format(hg_dir=hg_dir, out_dir=tmpdir, keys_dir=keys_dir)
82 config_ini = tmpdir.join('sitescripts.ini') 80 config_ini = tmpdir.join('sitescripts.ini')
83 config_ini.write(conf) 81 config_ini.write(conf)
84 return config_ini 82 return config_ini
OLDNEW
« no previous file with comments | « sitescripts/extensions/test/conftest.py ('k') | tests/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld