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 15 matching lines @@
 
 
 @pytest.fixture(scope='session', params=['master', None])
 def revision(request):
     return request.param
 
 
 @pytest.fixture(scope='session')
 def static_output(revision, request, temp_site):
     static_out_path = os.path.join(temp_site, 'static_out')
-    if revision is None:

[Vasily Kuznetsov, 2017/04/03 15:15:52]

We don't really need to repeat the standard args twice:

sys.argv = ['filler', temp_site, static_out_path]
if revision is not None:
    sys.argv += ['--rev', revision]

[Jon Sonesen, 2017/04/04 07:01:23]

Done.

-        sys.argv = ['filler', temp_site, static_out_path]
-    else:
-        sys.argv = ['filler', temp_site, static_out_path, '--rev', 'master']

[Vasily Kuznetsov, 2017/04/03 15:15:52]

The last item of the list should be `revision` but see comment above.

[Jon Sonesen, 2017/04/04 07:01:23]

Done.

+    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.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
@@ skipping 19 matching lines @@
 def test_dynamic(dynamic_server, filename, expected_output):
     response = urllib2.urlopen(dynamic_server + filename)
     assert response.read() == expected_output
 
 
 def test_revision_arg(revision, output_pages):
     if revision is None:
         assert 'bar' in output_pages
     else:
         assert 'bar' not in output_pages