Issue 4992 - Adds optional revision arg to generate_static_pages

tests/test_page_outputs.py

 import os
 import sys
 import time
 import runpy
 import signal
 import pytest
 import urllib2
 import subprocess
 from conftest import ROOTPATH
 
@@ skipping 10 matching lines @@
 def get_expected_outputs():
     expected_out_path = os.path.join(ROOTPATH, 'tests', 'expected_output')
     return get_dir_contents(expected_out_path).items()
 
 expected_outputs = get_expected_outputs()
 
 
 @pytest.fixture(scope='session')
 def static_output(request, temp_site):
     static_out_path = os.path.join(temp_site, 'static_out')
-    sys.argv = ['filler', temp_site, static_out_path]
+    sys.argv = ['filler', temp_site, static_out_path, '--rev', 'master']
     runpy.run_module('cms.bin.generate_static_pages', run_name='__main__')
     return static_out_path
 
 
 @pytest.yield_fixture()
 def dynamic_server(temp_site):
     args = ['python', 'runserver.py', temp_site]
     # Werkzeug is a dependency of flask which we are using for the mock api
     # however there is an issue with Werkzeug that prevents it from properly
     # handling the SIGTERM sent by p.kill() or terminate()
@@ skipping 11 matching lines @@
 
 @pytest.mark.parametrize('filename,expected_output', expected_outputs)
 def test_static(output_pages, filename, expected_output):
     assert output_pages[filename] == expected_output
 
 
 @pytest.mark.parametrize('filename,expected_output', expected_outputs)
 def test_dynamic(dynamic_server, filename, expected_output):
     response = urllib2.urlopen(dynamic_server + filename)
     assert response.read() == expected_output
+
+
+def test_revision_arg(output_pages):

[Jon Sonesen, 2017/04/01 12:40:56]

The bookmark consists of an additional page 'bar' which was added in the second
commit. The master bookmark should not contain this.

[Vasily Kuznetsov, 2017/04/03 09:55:08]

We should also run generation with no '--rev' argument and make sure that works
correctly.  One possible way to do it would be to not add  '--rev', 'master' as
default arguments in the `static_output` fixture and only add them in this test.
Then we could add an empty expected output for `bar.md` using the standard
approach (and normal testing will check that it's generated) and in this test we
would check that `bar` is not generated. Does this make sense?

[Jon Sonesen, 2017/04/03 10:11:00]

Acknowledged.

+    assert 'bar' not in output_pages