| Index: tests/test_additional_paths.py |
| =================================================================== |
| --- a/tests/test_additional_paths.py |
| +++ b/tests/test_additional_paths.py |
| @@ -8,17 +8,16 @@ |
| # Adblock Plus is distributed in the hope that it will be useful, |
| # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| # GNU General Public License for more details. |
| # |
| # You should have received a copy of the GNU General Public License |
| # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| -import subprocess |
| import sys |
| import urllib2 |
| import py |
| import pytest |
| import runpy |
| from cms.sources import create_source |
| @@ -56,21 +55,16 @@ |
| base_root.join('settings.ini').read() + |
| PATHS_FRAGMENT_TEMPLATE.format(base_root), |
| ) |
| pages = ap_root.mkdir('pages') |
| for file_name in ['filter.tmpl', 'global.md', 'translate.tmpl']: |
| pages.join(file_name).write('MAIN_SITE') |
| pages.join('map.tmpl').write(base_pages.join('sitemap.tmpl').read()) |
| - |
| - subprocess.check_call(['hg', 'init', ap_root.strpath]) |
| - subprocess.check_call(['hg', '-R', ap_root.strpath, |
| - 'commit', '-A', '-m', 'foo']) |
| - |
| return ap_root |
| @pytest.fixture(scope='session') |
| def ap_static_output(tmpdir_factory, ap_site): |
| """Generate website from two source directories, return output path.""" |
| out_path = tmpdir_factory.mktemp('ap_out') |
| saved_argv = sys.argv |