Issue 4574 - Adds Tests to createNightlies platform specific revisions

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': ('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')
 def data_dir(tests_dir):
     return tests_dir.join('data')
 
 
-# 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(scope='session')
+def diff_dir(data_dir):
+    return data_dir.join('diff')
+
+
 @pytest.fixture(scope='session')
 def keys_dir(tmpdir_factory, tests_dir):

[Jon Sonesen, 2016/11/04 15:11:55]

Went ahead and optimized this to be session scoped.....when running tox every
few minutes 30% slow down gets obnoxious.

[Vasily Kuznetsov, 2016/11/07 14:53:21]

:thumbsup:

     keys_dir = tmpdir_factory.mktemp('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))
 
 
+def hg_import(repo_dir, diff_dir):
+    call_hg(repo_dir, 'import', diff_dir.strpath, '--exact')
+
+
 @pytest.fixture(scope='session')
-def hg_dir(tmpdir_factory, data_dir):
+def hg_dir(tmpdir_factory, data_dir, diff_dir):
     """Directory that contains the repository mocks."""
     hg_dir = tmpdir_factory.mktemp('hg')
 
-    # Mock plugin repositories.
-    for repo, config in REPOS.items():
-        filename, tag = config
-        repo_dir = hg_dir.mkdir(repo)
+    # Mock repositories from diff and bookmarks.
+    for diff in diff_dir.visit():
+        repo_name = diff.purebasename.split('.')[0]
+        repo_dir = hg_dir.mkdir(repo_name)
         call_hg(repo_dir, 'init')
-        data_dir.join(filename).copy(repo_dir.join(filename))
-        call_hg(repo_dir, 'add', filename)
-        call_hg(repo_dir, 'commit', '-m', '1')
-        call_hg(repo_dir, 'tag', tag)
-
-    call_hg(hg_dir.join('adblockplusnightly'), 'bookmark', 'master')
-    call_hg(hg_dir.join('adblockplusnightly'), 'bookmark', 'safari')
-    command = ['touch', str(hg_dir.join('adblockplusnightly', 'foo'))]
-    subprocess.check_output(command)
-    call_hg(hg_dir.join('adblockplusnightly'), 'add', 'foo')
-    call_hg(hg_dir.join('adblockplusnightly'), 'commit', '-m', 'foo')

[Jon Sonesen, 2016/11/04 15:11:55]

This could all be moved into a separate fixture which might make the code easier
to follow and maintain.

[Vasily Kuznetsov, 2016/11/07 14:53:21]

I'm thinking that it might actually be better to switch to your proposed
approach with importing diffs for all the repos. Then the data would just be in
the diffs, the code here would be simpler and the fixture would be created
quicker. Sounds like win on all sides.

[Jon Sonesen, 2016/11/08 17:29:45]

Great, I will do this.

-
-    # Mock the downloads repository.
-    downloads_list = data_dir.join('downloads.list').read().splitlines()
-    downloads_dir = hg_dir.mkdir('downloads')
-    call_hg(downloads_dir, 'init')
-    for item in downloads_list:
-        downloads_dir.join(item).write('')
-    call_hg(downloads_dir, 'add', *downloads_list)
-    call_hg(downloads_dir, 'commit', '-m', 'ok')
+        bookmark_file = data_dir.join('bookmarks', repo_name + '.bookmarks')
+        if bookmark_file.exists():
+            destination = repo_dir.join('.hg').join('bookmarks')
+            bookmark_file.copy(destination)
+        hg_import(repo_dir, diff)
 
     return hg_dir
-
-
-@pytest.fixture(scope='session')
-def nightly_dir(hg_dir):
-    return hg_dir.join('adblockplusnightly')
 
 
 @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