Issue 6545 - get_pages_metadata now returns all pages

tests/test_page_outputs.py

 import os
 import sys
 import runpy
 import pytest
 import urllib2
 
 from .conftest import ROOTPATH
 from .utils import get_dir_contents, run_test_server
 
 
 def get_expected_outputs(test_type):
     expected_out_path = os.path.join(ROOTPATH, 'tests', 'expected_output')
     outputs = get_dir_contents(expected_out_path)
     for filename in list(outputs):
         # Move test-type-specific expected outputs (e.g. "xyz@static" -> "xyz")
-        # and remove the expected outputs that don't apply for this test type.
+        # 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]
-        if ':' in filename:

[Vasily Kuznetsov, 2018/04/17 18:36:08]

It seems like the code in this `if` is not necessary. The filename will either
have '@' + test_type in it or not. If it does, the assignment of line 22 has
been already done by line 19. If it doesn't, realname will be the same as
filename and then line 22 is a noop.

Or am I confused?

[Jon Sonesen, 2018/04/17 21:02:40]

As discussed very IRC the code is necessary however, the reason tests pass is
that there is now edge cases in the static test function that will now quietly
pass tests that don't fit the correct formatting. I will change that, thanks for
your comment!

+        # 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])
@@ skipping 20 matching lines @@
 
 @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):
     if expected_output.startswith('## MISSING'):
         assert filename not in output_pages
-    elif revision and ':' + revision in filename:
-        filename = filename.split(':')[0]
+    elif revision and '+' + revision in filename:
+        filename = filename.split('+')[0]
         assert expected_output == output_pages[filename]
-    elif not revision and ':' not in filename:
+    elif not revision and '+' not in filename:
         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