merge

_pytest/_argcomplete.py

@@ -74,9 +74,13 @@ class FastFilesCompleter:
         else:
             prefix_dir = 0
         completion = []
+        globbed = []
         if '*' not in prefix and '?' not in prefix:
+            if prefix[-1] == os.path.sep:  # we are on unix, otherwise no bash
+                globbed.extend(glob(prefix + '.*'))
             prefix += '*'
-        for x in sorted(glob(prefix)):
+        globbed.extend(glob(prefix))
+        for x in sorted(globbed):
             if os.path.isdir(x):
                 x += '/'
             # append stripping the prefix (like bash, not like compgen)

doc/en/skipping.txt

@@ -183,7 +183,7 @@ Skip/xfail with parametrize
 ---------------------------
 
 It is possible to apply markers like skip and xfail to individual
-test instances when using parametrize:
+test instances when using parametrize::
 
      import pytest
 
@@ -191,7 +191,7 @@ test instances when using parametrize:
          (1, 2),
 	 pytest.mark.xfail((1, 0)),
 	 pytest.mark.xfail(reason="some bug")((1, 3)),
-	 (2, 3),
+         (2, 3),
          (3, 4),
          (4, 5),
          pytest.mark.skipif("sys.version_info >= (3,0)")((10, 11)),