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

Unified Diff: sitescripts/extensions/test/test_updateManifests.py

Issue 29358368: Issue 4540 - Add Platform Specific Branch Support to createNightlies.py (Closed)
Patch Set: adds fixture to generate place holder nightlies file, removes nightlies file from repo Created Oct. 25, 2016, 10:29 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sitescripts/extensions/test/test_updateManifests.py
===================================================================
--- a/sitescripts/extensions/test/test_updateManifests.py
+++ b/sitescripts/extensions/test/test_updateManifests.py
@@ -15,95 +15,16 @@
"""Tests for update manifest generation script."""
import json
import os
import subprocess
import xml.etree.ElementTree as ET
-import pytest
-import py
-
-
-@pytest.fixture()
-def tests_dir():
- """Directory that contains this tests and the data files it uses."""
- return py.path.local(__file__).dirpath()
-
-
-@pytest.fixture()
-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()
-def data_dir(tests_dir):
- return tests_dir.join('data')
-
-
-@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))
-
-
-REPOS = {
- 'adblockplus': ('metadata.gecko', '2.7.3'),
- 'adblockplusie': ('README.txt', '1.33.7'),
- 'adblockpluschrome': ('metadata.safari', '1.12.3'),
- 'adblockplusandroid': ('AndroidManifest.xml', '1.3')
-}
-
-
-@pytest.fixture()
-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)
- call_hg(repo_dir, 'commit', '-m', '1')
- call_hg(repo_dir, 'tag', tag)
-
- # 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')
-
- return hg_dir
-
-
-@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
-
def rdf2data(rdf):
"""Convert RDF to a more comparable data strcuture."""
# We need this to address the RDF item ordering discrepancies.
def et2data(node):
return {
'tag': node.tag,
'text': node.text,

Powered by Google App Engine
This is Rietveld