From 187b971ec7c554e228e36569988aca9d5b1dd6eb Mon Sep 17 00:00:00 2001
From: Andreas Pelme <andreas@pelme.se>
Date: Tue, 20 Dec 2016 11:22:18 +0100
Subject: [PATCH] Failing test for issue #2148.

---
 testing/test_config.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/testing/test_config.py b/testing/test_config.py
index 21ceab1e282..6bc867737fd 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -527,6 +527,29 @@ def test_toolongargs_issue224(testdir):
     result = testdir.runpytest("-m", "hello" * 500)
     assert result.ret == EXIT_NOTESTSCOLLECTED
 
+def test_config_in_subdirectory_colon_command_line_issue2148(testdir):
+    conftest_source = '''
+        def pytest_addoption(parser):
+            parser.addini('foo', 'foo')
+    '''
+
+    testdir.makefile('.ini', **{
+        'pytest': '[pytest]\nfoo = root',
+        'subdir/pytest': '[pytest]\nfoo = subdir',
+    })
+
+    testdir.makepyfile(**{
+        'conftest': conftest_source,
+        'subdir/conftest': conftest_source,
+        'subdir/test_foo': '''
+            def test_foo(pytestconfig):
+                assert pytestconfig.getini('foo') == 'subdir'
+        '''})
+
+    result = testdir.runpytest('subdir/test_foo.py::test_foo')
+    assert result.ret == 0
+
+
 def test_notify_exception(testdir, capfd):
     config = testdir.parseconfig()
     excinfo = pytest.raises(ValueError, "raise ValueError(1)")