| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 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 import os | 16 import os |
| 16 from subprocess import CalledProcessError | 17 from subprocess import CalledProcessError |
| 17 | 18 |
| 18 import pytest | 19 import pytest |
| 19 | 20 |
| 20 from sitescripts.extensions.bin import createNightlies | 21 from sitescripts.extensions.bin import createNightlies |
| 21 from sitescripts.utils import get_config | 22 from sitescripts.utils import get_config |
| 22 | 23 |
| 23 | 24 |
| 24 @pytest.fixture(scope='session') | 25 @pytest.fixture(scope='session') |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 40 @pytest.fixture(scope='session') | 41 @pytest.fixture(scope='session') |
| 41 def nightlybuild(config): | 42 def nightlybuild(config): |
| 42 return createNightlies.NightlyBuild(config) | 43 return createNightlies.NightlyBuild(config) |
| 43 | 44 |
| 44 | 45 |
| 45 def test_nightly_object_bookmark(nightlybuild): | 46 def test_nightly_object_bookmark(nightlybuild): |
| 46 assert nightlybuild.config.revision == 'safari' | 47 assert nightlybuild.config.revision == 'safari' |
| 47 | 48 |
| 48 | 49 |
| 49 def test_current_revision(nightlybuild): | 50 def test_current_revision(nightlybuild): |
| 50 # This inline hash is for the expected revision of the safari bookmark rev | 51 # The hash is the commit that the safari bookmark points to. |
|
Vasily Kuznetsov
2016/11/21 12:21:45
I think this comment could be improved a bit. We s
Jon Sonesen
2016/11/21 17:00:07
Done.
| |
| 52 # (see adblockplusnightly.bookmark in test/data/bookmarks) | |
| 51 assert nightlybuild.revision == '1291590ddd0f' | 53 assert nightlybuild.revision == '1291590ddd0f' |
| 52 | 54 |
| 53 | 55 |
| 54 def test_copy_repository(nightlybuild, nightlydir): | 56 def test_copy_repository(nightlybuild, nightlydir): |
| 55 nightlybuild.copyRepository() | 57 nightlybuild.copyRepository() |
| 56 assert os.listdir(nightlybuild.tempdir) == ['.hg', 'README.txt'] | 58 assert os.listdir(nightlybuild.tempdir) == ['.hg', 'README.txt'] |
| 57 | 59 |
| 58 | 60 |
| 59 def test_get_changes(nightlybuild, nightlydir): | 61 def test_get_changes(nightlybuild, nightlydir): |
| 60 # The bookmark 'safari' contains only 2 revisions | 62 # The bookmark 'safari' contains only 2 revisions |
| 61 # default contains 51 so here we ensure that erroneous changes | 63 # default contains 51 so here we ensure that erroneous changes |
| 62 # are not returned | 64 # are not returned |
| 63 for change in nightlybuild.getChanges(): | 65 for change in nightlybuild.getChanges(): |
| 64 assert change['revision'] < '2' | 66 assert change['revision'] < '2' |
| 65 | 67 |
| 66 nightlybuild.config.revision = 'default' | 68 nightlybuild.config.revision = 'default' |
| 67 for change in nightlybuild.getChanges(): | 69 for change in nightlybuild.getChanges(): |
| 68 assert change['revision'] > '1' | 70 assert change['revision'] > '1' |
| 69 | 71 |
| 70 | 72 |
| 71 def test_missing_bookmark(config): | 73 def test_missing_bookmark(config): |
| 72 config.revision = 'foo' | 74 config.revision = 'foo' |
| 73 config.type = 'type' | 75 config.type = 'type' |
| 74 try: | 76 try: |
| 75 createNightlies.NightlyBuild(config) | 77 createNightlies.NightlyBuild(config) |
| 76 except CalledProcessError as e: | 78 except CalledProcessError as e: |
| 77 assert e.returncode == 255 | 79 assert e.returncode == 255 |
| LEFT | RIGHT |