Issue 6728 - Remove Mercurial dependency

tests/test_page_outputs.py

Index: tests/test_page_outputs.py
===================================================================
--- a/tests/test_page_outputs.py
+++ b/tests/test_page_outputs.py
@@ -1,11 +1,13 @@
 import os
 import sys
 import runpy
+
+import mock
 import pytest
 import urllib2
 
 from .conftest import ROOTPATH
 from .utils import get_dir_contents, run_test_server
 
 
 def get_expected_outputs(test_type):
@@ -13,44 +15,31 @@
     outputs = get_dir_contents(expected_out_path)
     for filename in list(outputs):
         # Move test-type-specific expected outputs (e.g. "xyz@static" -> "xyz")
         # There are cases where we need to test outputs which differ depending
         # on how they are generated; either statically or dynamically
         if filename.endswith('@' + test_type):
             realname = filename.split('@')[0]
             outputs[realname] = outputs[filename]
-        # Move bookmark specific output (e.g. "xyx@static+master -> xyz+master)
-        # There are cases where we need to test outputs which differ depending
-        # on the bookmark which they are generated from:
-        # https://issues.adblockplus.org/ticket/6605
-        if '+' in filename:
-            realname = ''.join(filename.split('@' + test_type))
-            outputs[realname] = outputs[filename]
         # Remove the expected outputs that don't apply for this test type.
         if '@' in filename:
             del outputs[filename]
     return outputs.items()
 
 
 static_expected_outputs = get_expected_outputs('static')
 dynamic_expected_outputs = get_expected_outputs('dynamic')
 
 
-@pytest.fixture(scope='session', params=['master', None])
-def revision(request):
-    return request.param
-
-
+@mock.patch('cms.sources.FileSource.version', 1)
 @pytest.fixture(scope='session')
-def static_output(revision, request, temp_site):
+def static_output(request, temp_site):
     static_out_path = os.path.join(temp_site, 'static_out')
     sys.argv = ['filler', temp_site, static_out_path]
-    if revision is not None:
-        sys.argv += ['--rev', revision]
 
     runpy.run_module('cms.bin.generate_static_pages', run_name='__main__')
     return static_out_path
 
 
 @pytest.fixture(scope='module')
 def dynamic_server(temp_site):
     with run_test_server(temp_site) as ts:
@@ -58,29 +47,19 @@
 
 
 @pytest.fixture(scope='session')
 def output_pages(static_output):
     return get_dir_contents(static_output)
 
 
 @pytest.mark.parametrize('filename,expected_output', static_expected_outputs)
-def test_static(revision, output_pages, filename, expected_output):
+def test_static(output_pages, filename, expected_output):
     if expected_output.startswith('## MISSING'):
         assert filename not in output_pages
-    elif revision and '+' + revision in filename:
-        filename = filename.split('+')[0]
-        assert expected_output == output_pages[filename]
-    elif not revision and '+' not in filename:
-        assert expected_output == output_pages[filename]
+        return

[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

+    assert expected_output == output_pages[filename]
 
 
 @pytest.mark.parametrize('filename,expected_output', dynamic_expected_outputs)
 def test_dynamic(dynamic_server, filename, expected_output):
     response = urllib2.urlopen(dynamic_server + filename)
     assert expected_output == response.read().strip()
-
-
-def test_revision_arg(revision, output_pages):
-    if revision is None:
-        assert 'en/bar' in output_pages
-    else:
-        assert 'en/bar' not in output_pages