Merge pull request #800 from pytest-dev/confcutdir-test-fix

Check conftest.py is not loaded with --confcutdir.

testing/test_conftest.py

@@ -171,6 +171,7 @@ def test_conftest_confcutdir(testdir):
     """))
     result = testdir.runpytest("-h", "--confcutdir=%s" % x, x)
     result.stdout.fnmatch_lines(["*--xyz*"])
+    assert 'warning: could not load initial' not in result.stdout.str()
 
 def test_conftest_existing_resultlog(testdir):
     x = testdir.mkdir("tests")