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

Delta Between Two Patch Sets: sitescripts/extensions/test/test_createNightlies.py

Issue 29361729: Issue 4574 - Adds Tests to createNightlies platform specific revisions (Closed)
Left Patch Set: Created Nov. 11, 2016, 10:30 a.m.
Right Patch Set: add bookmark files so that all repos have master bookmark, add white space below license Created Nov. 25, 2016, 10:15 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/extensions/test/data/diff/downloads.diff ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-2016 Eyeo GmbH 2 # Copyright (C) 2006-2016 Eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 """Tests for create nightlies script."""
17 import os 16 import os
18 from subprocess import CalledProcessError 17 from subprocess import CalledProcessError
19 18
20 import pytest 19 import pytest
21 20
22 from sitescripts.extensions.bin import createNightlies 21 from sitescripts.extensions.bin import createNightlies
23 from sitescripts.utils import get_config 22 from sitescripts.utils import get_config
24 23
25 24
26 @pytest.fixture(scope='session') 25 @pytest.fixture(scope='session')
27 def config(hg_dir): 26 def nightlydir(hg_dir):
27 return hg_dir.join('adblockplusnightly')
28
29
30 @pytest.fixture(scope='session')
31 def config(hg_dir, nightlydir):
28 """Set and return config obj for NightlyBuild""" 32 """Set and return config obj for NightlyBuild"""
29 config = get_config() 33 config = get_config()
30 config.type = 'safari' 34 config.type = 'safari'
31 config.revision = 'safari' 35 config.revision = 'safari'
32 config.repositoryName = 'adblockplusnightly' 36 config.repositoryName = 'adblockplusnightly'
33 config.repository = hg_dir.join('adblockplusnightly').strpath 37 config.repository = nightlydir.strpath
Vasily Kuznetsov 2016/11/14 19:42:38 This seems to be `nightly_dir`.
Jon Sonesen 2016/11/15 11:18:47 it is
34 return config 38 return config
35 39
36 40
37 @pytest.fixture(scope='session') 41 @pytest.fixture(scope='session')
38 def nightlybuild(config): 42 def nightlybuild(config):
39 return createNightlies.NightlyBuild(config) 43 return createNightlies.NightlyBuild(config)
40 44
41 45
42 @pytest.fixture(scope='session')
43 def current_revision(nightlydir):
44 return '1291590ddd0f'
45
46
47 def test_nightly_object_bookmark(nightlybuild): 46 def test_nightly_object_bookmark(nightlybuild):
48 assert nightlybuild.config.revision == 'safari' 47 assert nightlybuild.config.revision == 'safari'
49 48
50 49
51 def test_current_revision(current_revision, nightlybuild): 50 def test_current_revision(nightlybuild):
52 assert nightlybuild.revision == current_revision 51 # The hash is the commit that the safari bookmark points to.
52 # (see adblockplusnightly.bookmark in test/data/bookmarks)
53 assert nightlybuild.revision == '1291590ddd0f'
53 54
54 55
55 def test_copy_repository(nightlybuild, nightlydir): 56 def test_copy_repository(nightlybuild, nightlydir):
56 nightlybuild.copyRepository() 57 nightlybuild.copyRepository()
57 assert os.listdir(nightlybuild.tempdir) == os.listdir(nightlydir.strpath) 58 assert os.listdir(nightlybuild.tempdir) == ['.hg', 'README.txt']
59
60
61 def test_get_changes(nightlybuild, nightlydir):
62 # The bookmark 'safari' contains only 2 revisions
63 # default contains 51 so here we ensure that erroneous changes
64 # are not returned
65 for change in nightlybuild.getChanges():
66 assert change['revision'] < '2'
67
68 nightlybuild.config.revision = 'default'
69 for change in nightlybuild.getChanges():
70 assert change['revision'] > '1'
58 71
59 72
60 def test_missing_bookmark(config): 73 def test_missing_bookmark(config):
61 config.revision = 'foo' 74 config.revision = 'foo'
62 config.type = 'type' 75 config.type = 'type'
63 try: 76 try:
64 createNightlies.NightlyBuild(config) 77 createNightlies.NightlyBuild(config)
65 except CalledProcessError as e: 78 except CalledProcessError as e:
66 assert e.returncode == 255 79 assert e.returncode == 255
LEFTRIGHT

Powered by Google App Engine
This is Rietveld