Issue 4540 - Add Platform Specific Branch Support to createNightlies.py

sitescripts/extensions/test/conftest.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 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
 
 REPOS = {
     'adblockplus': ('metadata.gecko', '2.7.3'),
     'adblockplusie': ('README.txt', '1.33.7'),
     'adblockpluschrome': ('metadata.safari', '1.12.3'),
     'adblockplusandroid': ('AndroidManifest.xml', '1.3'),
-    'adblockplusnightly': ('nightlies', '0.0')
+    'adblockplusnightly': ('README.txt', '0.0')
 }
 
 
 @pytest.fixture(scope='session')
 def tests_dir():
     """Directory that contains this tests and the data files it uses."""
     return py.path.local(__file__).dirpath()
 
 
 @pytest.fixture(scope='session')

[Vasily Kuznetsov, 2016/10/25 16:04:33]

This fixture is only used by `test_updateManifests.py` only. It will probably be
easier to understand things if we leave it in that file.

[Jon Sonesen, 2016/10/25 16:42:59]

Acknowledged

-def oracle(tests_dir):
-    """Function that returns expected content of generated files."""
-    def expected_value_of(what):
-        return tests_dir.join('oracle').join(what).read().strip()
-    return expected_value_of
-
-
-@pytest.fixture(scope='session')
 def data_dir(tests_dir):
     return tests_dir.join('data')
-
-
-@pytest.fixture(scope='session')

[Vasily Kuznetsov, 2016/10/25 16:04:33]

The `nightlies` file that we create here and then copy to the repo doesn't seem
to be used afterwards. Could we just use 'README.txt' instead and remove this
fixture?

[Jon Sonesen, 2016/10/25 16:23:49]

Im not sure what you mean by this. The nightlies file is required due to the
example configuration. Are you saying I should just change that option to be the
README.txt? Then the example config would be more ambiguous or I could have the
test code dynamically set thta config option to README.txt and then update the
statically coded repo structure.

[Vasily Kuznetsov, 2016/10/25 16:39:22]

I don't think it's required for the test that we have. The place where the
`nightlies` file is read is in the `main` function of `createNightlies.py` and
we're not calling it in the test. We are also giving our own config to
`NightlyBuild` and not the content of `nightlies` so we could as well not have
that file. All in all, the tests work fine without the `tmp_nightlies` fixture
(after line 30 is updated to use `README.txt`).

[Jon Sonesen, 2016/10/25 16:42:59]

Okay, I will update that thank you.

-def tmp_nightly(data_dir):
-    subprocess.check_call(['touch', str(data_dir.join('nightlies'))])
-    yield
-    subprocess.check_call(['rm', str(data_dir.join('nightlies'))])
 
 
 # Fixtures using the built in tmpdir fixture must be function scoped which
 # causes about a 30% slow down. It would be faster to use tmpdir_factory
 # which is session scoped but for no it is not important.
 @pytest.fixture()
 def keys_dir(tmpdir, tests_dir):
     keys_dir = tmpdir.mkdir('keys')
     key_filename = 'adblockplussafari.pem'
     tests_dir.join(key_filename).copy(keys_dir.join(key_filename))
     return keys_dir
 
 
 def call_hg(cwd, *params):
     return subprocess.check_call(['hg'] + list(params), cwd=str(cwd))
 
 
 @pytest.fixture()
-def hg_dir(tmp_nightly, tmpdir, data_dir):
+def hg_dir(tmpdir, data_dir):
     """Directory that contains the repository mocks."""
     hg_dir = tmpdir.mkdir('hg')
 
     # Mock plugin repositories.
     for repo, config in REPOS.items():
         filename, tag = config
         repo_dir = hg_dir.mkdir(repo)
         call_hg(repo_dir, 'init')
         data_dir.join(filename).copy(repo_dir.join(filename))
         call_hg(repo_dir, 'add', filename)
@@ skipping 15 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