Merge master into features

2018-11-19 12:55:29 +01:00
parent 62967b3110 a281d6620b
commit 2754a13f86
12 changed files with 69 additions and 24 deletions
--- a/src/_pytest/config/init.py
+++ b/src/_pytest/config/init.py
@@ -852,10 +852,7 @@ class Config(object):
            )
            if not args:
                if self.invocation_dir == self.rootdir:
-                    args = [
-                        str(self.invocation_dir.join(x, abs=True))
-                        for x in self.getini("testpaths")
-                    ]
+                    args = self.getini("testpaths")
                if not args:
                    args = [str(self.invocation_dir)]
            self.args = args