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

Delta Between Two Patch Sets: tests/test_page_outputs.py

Issue 29805580: Issue 6728 - Remove Mercurial dependency (Closed)
Left Patch Set: Addremove files to diff Created June 12, 2018, 11:01 p.m.
Right Patch Set: Address PS4 comment Created July 9, 2018, 6:13 p.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 | « tests/test_additional_paths.py ('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 import os 1 import os
2 import sys 2 import sys
3 import runpy 3 import runpy
4 4
5 import mock 5 import mock
6 import pytest 6 import pytest
7 import urllib2 7 import urllib2
8 8
9 from .conftest import ROOTPATH 9 from .conftest import ROOTPATH
10 from .utils import get_dir_contents, run_test_server 10 from .utils import get_dir_contents, run_test_server
11 from cms.sources import FileSource
11 12
12 13
13 def get_expected_outputs(test_type): 14 def get_expected_outputs(test_type):
14 expected_out_path = os.path.join(ROOTPATH, 'tests', 'expected_output') 15 expected_out_path = os.path.join(ROOTPATH, 'tests', 'expected_output')
15 outputs = get_dir_contents(expected_out_path) 16 outputs = get_dir_contents(expected_out_path)
16 for filename in list(outputs): 17 for filename in list(outputs):
17 # Move test-type-specific expected outputs (e.g. "xyz@static" -> "xyz") 18 # Move test-type-specific expected outputs (e.g. "xyz@static" -> "xyz")
18 # There are cases where we need to test outputs which differ depending 19 # There are cases where we need to test outputs which differ depending
19 # on how they are generated; either statically or dynamically 20 # on how they are generated; either statically or dynamically
20 if filename.endswith('@' + test_type): 21 if filename.endswith('@' + test_type):
(...skipping 27 matching lines...) Expand all
48 49
49 @pytest.fixture(scope='session') 50 @pytest.fixture(scope='session')
50 def output_pages(static_output): 51 def output_pages(static_output):
51 return get_dir_contents(static_output) 52 return get_dir_contents(static_output)
52 53
53 54
54 @pytest.mark.parametrize('filename,expected_output', static_expected_outputs) 55 @pytest.mark.parametrize('filename,expected_output', static_expected_outputs)
55 def test_static(output_pages, filename, expected_output): 56 def test_static(output_pages, filename, expected_output):
56 if expected_output.startswith('## MISSING'): 57 if expected_output.startswith('## MISSING'):
57 assert filename not in output_pages 58 assert filename not in output_pages
58 return 59 else:
Vasily Kuznetsov 2018/06/13 13:35:23 Maybe this could just be replaced with `else:`.
Jon Sonesen 2018/06/14 19:24:15 Heh, yeah for sure whoops
Vasily Kuznetsov 2018/07/03 08:50:24 This one seems to still be there in PS3
59 assert expected_output == output_pages[filename] 60 assert expected_output == output_pages[filename]
60 61
61 62
62 @pytest.mark.parametrize('filename,expected_output', dynamic_expected_outputs) 63 @pytest.mark.parametrize('filename,expected_output', dynamic_expected_outputs)
63 def test_dynamic(dynamic_server, filename, expected_output): 64 def test_dynamic(dynamic_server, filename, expected_output):
64 response = urllib2.urlopen(dynamic_server + filename) 65 response = urllib2.urlopen(dynamic_server + filename)
65 assert expected_output == response.read().strip() 66 assert expected_output == response.read().strip()
67
68
69 def test_cache(output_pages):
70 source = FileSource(os.path.join('test_site'))
71 assert source.get_cache_dir() == os.path.join('test_site', 'cache')
LEFTRIGHT

Powered by Google App Engine
This is Rietveld