#3332 Fix message

Author: feuillemorte

_pytest/config.py

@@ -54,7 +54,7 @@ def main(args=None, plugins=None):
             tw = py.io.TerminalWriter(sys.stderr)
             formatted_tb = safe_str(e)
             tw.line(
-                "ImportError while importing test module '{path}'.\n"
+                "ImportError while importing conftest module '{path}'.\n"
                 "Hint: make sure your test modules/packages have valid Python names.\n"
                 "Traceback:\n"
                 "{traceback}".format(path=e.path, traceback=formatted_tb),

testing/acceptance_test.py

@@ -145,7 +145,7 @@ def test_issue486_better_reporting_on_conftest_load_failure(self, testdir):
             *warning*conftest.py*
         """)
         result = testdir.runpytest()
-        result.stderr.fnmatch_lines(["*ImportError while importing test module*conftest.py*",
+        result.stderr.fnmatch_lines(["*ImportError while importing conftest module*conftest.py*",
                                     "E    *Error: No module named*qwerty*"]
                                     )