Issue 7112 - Add centralised conftest

sitescripts/extensions/test/utils.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # 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/>.
 
 """
 Contains fixtures that are useful across test scripts for the extensions module
 """
 
 import subprocess
 
 import pytest
 import py
 
 
 @pytest.fixture(scope='session')
 def tests_dir():
     """Directory that contains this tests and the data files it uses."""
-    return py.path.local(__file__).dirpath()
+    return py.path.local('sitescripts/extensions/test/')

[Vasily Kuznetsov, 2018/11/14 16:34:40]

I think it's better to use the approach based on __file__ otherwise the test
behaviour starts depending on current directory, which is not great.

[Tudor Avram, 2018/11/14 17:00:19]

Done.

 
 
 @pytest.fixture(scope='session')
 def data_dir(tests_dir):
     return tests_dir.join('data')
 
 
 @pytest.fixture(scope='session')
 def diff_dir(data_dir):
     return data_dir.join('diff')
@@ skipping 35 matching lines @@
 
 
 @pytest.fixture()
 def config_ini(tests_dir, tmpdir, hg_dir, keys_dir):
     """Sitescripts configuration."""
     template = tests_dir.join('sitescripts.ini.template').read()
     conf = template.format(hg_dir=hg_dir, out_dir=tmpdir, keys_dir=keys_dir)
     config_ini = tmpdir.join('sitescripts.ini')
     config_ini.write(conf)
     return config_ini