Harden test_collect_init_tests

Fails with:

    E       Failed: nomatch: 'collected 2 items'
    E           and: '==================================================================================== test session starts ====================================================================================='
    E           and: 'platform linux -- Python 3.6.6, pytest-3.10.1.dev18+g01c8fab1, py-1.7.0, pluggy-0.8.0'
    E           and: "hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('…/Vcs/pytest/.hypothesis/examples')"
    E           and: 'rootdir: /tmp/pytest-of-user/pytest-683/test_collect_init_tests0, inifile: pytest.ini'
    E           and: 'plugins: testmon-0.9.13, hypothesis-3.71.10'
    E       exact match: 'collected 2 items'
    E       fnmatch: '<Package *'
    E          with: "<Package '/tmp/pytest-of-user/pytest-683/test_collect_init_tests0/tests'>"
    E       nomatch: "  <Module '__init__.py'>"
    E           and: "  <Package '/tmp/pytest-of-user/pytest-683/test_collect_init_tests0/tests'>"
    E           and: "    <Module '__init__.py'>"
    E           and: "      <Function 'test_init'>"
    E           and: "    <Module 'test_foo.py'>"
    E           and: "      <Function 'test_foo'>"
    E           and: ''
    E           and: '================================================================================ no tests ran in 0.02 seconds ================================================================================'
    E           and: ''
    E       remains unmatched: "  <Module '__init__.py'>"

    …/Vcs/pytest/testing/test_collection.py:970: Failed

Author: blueyed

testing/test_collection.py

@@ -951,19 +951,23 @@ def test_collect_init_tests(testdir):
     result = testdir.runpytest(p, "--collect-only")
     result.stdout.fnmatch_lines(
         [
-            "*<Module '__init__.py'>",
-            "*<Function 'test_init'>",
-            "*<Module 'test_foo.py'>",
-            "*<Function 'test_foo'>",
+            "collected 2 items",
+            "<Package *",
+            "  <Module '__init__.py'>",
+            "    <Function 'test_init'>",
+            "  <Module 'test_foo.py'>",
+            "    <Function 'test_foo'>",
         ]
     )
     result = testdir.runpytest("./tests", "--collect-only")
     result.stdout.fnmatch_lines(
         [
-            "*<Module '__init__.py'>",
-            "*<Function 'test_init'>",
-            "*<Module 'test_foo.py'>",
-            "*<Function 'test_foo'>",
+            "collected 2 items",
+            "<Package *",
+            "  <Module '__init__.py'>",
+            "    <Function 'test_init'>",
+            "  <Module 'test_foo.py'>",
+            "    <Function 'test_foo'>",
         ]
     )
     result = testdir.runpytest("./tests/test_foo.py", "--collect-only")