Update tests - conver no parent .gitignore case.

psf · May 15, 2021 · 7d42596 · 7d42596
1 parent 004cdd8
commit 7d42596
Show file tree

Hide file tree

Showing 60 changed files with 10 additions and 10 deletions.
diff --git a/.coverage.LAPTOP-K50SM9F6.1266.194096 b/.coverage.LAPTOP-K50SM9F6.1266.194096
diff --git a/.coverage.LAPTOP-K50SM9F6.1267.413730 b/.coverage.LAPTOP-K50SM9F6.1267.413730
diff --git a/.coverage.LAPTOP-K50SM9F6.1268.988152 b/.coverage.LAPTOP-K50SM9F6.1268.988152
diff --git a/.coverage.LAPTOP-K50SM9F6.1269.179618 b/.coverage.LAPTOP-K50SM9F6.1269.179618
diff --git a/.coverage.LAPTOP-K50SM9F6.1270.838264 b/.coverage.LAPTOP-K50SM9F6.1270.838264
diff --git a/.coverage.LAPTOP-K50SM9F6.1271.867560 b/.coverage.LAPTOP-K50SM9F6.1271.867560
diff --git a/.coverage.LAPTOP-K50SM9F6.1272.618260 b/.coverage.LAPTOP-K50SM9F6.1272.618260
diff --git a/.coverage.LAPTOP-K50SM9F6.1275.523939 b/.coverage.LAPTOP-K50SM9F6.1275.523939
diff --git a/.coverage.LAPTOP-K50SM9F6.1276.487099 b/.coverage.LAPTOP-K50SM9F6.1276.487099
diff --git a/.coverage.LAPTOP-K50SM9F6.1277.557032 b/.coverage.LAPTOP-K50SM9F6.1277.557032
diff --git a/.coverage.LAPTOP-K50SM9F6.1278.005635 b/.coverage.LAPTOP-K50SM9F6.1278.005635
diff --git a/.coverage.LAPTOP-K50SM9F6.1281.743123 b/.coverage.LAPTOP-K50SM9F6.1281.743123
diff --git a/.coverage.LAPTOP-K50SM9F6.1283.065579 b/.coverage.LAPTOP-K50SM9F6.1283.065579
diff --git a/.coverage.LAPTOP-K50SM9F6.1285.228318 b/.coverage.LAPTOP-K50SM9F6.1285.228318
diff --git a/.coverage.LAPTOP-K50SM9F6.1286.684165 b/.coverage.LAPTOP-K50SM9F6.1286.684165
diff --git a/.coverage.LAPTOP-K50SM9F6.1287.328072 b/.coverage.LAPTOP-K50SM9F6.1287.328072
diff --git a/.coverage.LAPTOP-K50SM9F6.1288.870513 b/.coverage.LAPTOP-K50SM9F6.1288.870513
diff --git a/.coverage.LAPTOP-K50SM9F6.1289.695979 b/.coverage.LAPTOP-K50SM9F6.1289.695979
diff --git a/.coverage.LAPTOP-K50SM9F6.1290.562655 b/.coverage.LAPTOP-K50SM9F6.1290.562655
diff --git a/.coverage.LAPTOP-K50SM9F6.1291.211433 b/.coverage.LAPTOP-K50SM9F6.1291.211433
diff --git a/.coverage.LAPTOP-K50SM9F6.1292.638844 b/.coverage.LAPTOP-K50SM9F6.1292.638844
diff --git a/.coverage.LAPTOP-K50SM9F6.1293.232301 b/.coverage.LAPTOP-K50SM9F6.1293.232301
diff --git a/.coverage.LAPTOP-K50SM9F6.1294.333797 b/.coverage.LAPTOP-K50SM9F6.1294.333797
diff --git a/.coverage.LAPTOP-K50SM9F6.1295.186390 b/.coverage.LAPTOP-K50SM9F6.1295.186390
diff --git a/.coverage.LAPTOP-K50SM9F6.1423.708192 b/.coverage.LAPTOP-K50SM9F6.1423.708192
diff --git a/.coverage.LAPTOP-K50SM9F6.1424.091769 b/.coverage.LAPTOP-K50SM9F6.1424.091769
diff --git a/.coverage.LAPTOP-K50SM9F6.1425.200163 b/.coverage.LAPTOP-K50SM9F6.1425.200163
diff --git a/.coverage.LAPTOP-K50SM9F6.1426.885221 b/.coverage.LAPTOP-K50SM9F6.1426.885221
diff --git a/.coverage.LAPTOP-K50SM9F6.1427.359229 b/.coverage.LAPTOP-K50SM9F6.1427.359229
diff --git a/.coverage.LAPTOP-K50SM9F6.1429.323999 b/.coverage.LAPTOP-K50SM9F6.1429.323999
diff --git a/.coverage.LAPTOP-K50SM9F6.1430.637775 b/.coverage.LAPTOP-K50SM9F6.1430.637775
diff --git a/.coverage.LAPTOP-K50SM9F6.1431.308797 b/.coverage.LAPTOP-K50SM9F6.1431.308797
diff --git a/.coverage.LAPTOP-K50SM9F6.1432.907767 b/.coverage.LAPTOP-K50SM9F6.1432.907767
diff --git a/.coverage.LAPTOP-K50SM9F6.1433.107895 b/.coverage.LAPTOP-K50SM9F6.1433.107895
diff --git a/.coverage.LAPTOP-K50SM9F6.1434.391778 b/.coverage.LAPTOP-K50SM9F6.1434.391778
diff --git a/.coverage.LAPTOP-K50SM9F6.1435.118452 b/.coverage.LAPTOP-K50SM9F6.1435.118452
diff --git a/.coverage.LAPTOP-K50SM9F6.1440.923217 b/.coverage.LAPTOP-K50SM9F6.1440.923217
diff --git a/.coverage.LAPTOP-K50SM9F6.1441.033810 b/.coverage.LAPTOP-K50SM9F6.1441.033810
diff --git a/.coverage.LAPTOP-K50SM9F6.1442.447792 b/.coverage.LAPTOP-K50SM9F6.1442.447792
diff --git a/.coverage.LAPTOP-K50SM9F6.1443.416247 b/.coverage.LAPTOP-K50SM9F6.1443.416247
diff --git a/.coverage.LAPTOP-K50SM9F6.1444.489506 b/.coverage.LAPTOP-K50SM9F6.1444.489506
diff --git a/.coverage.LAPTOP-K50SM9F6.1445.499453 b/.coverage.LAPTOP-K50SM9F6.1445.499453
diff --git a/.coverage.LAPTOP-K50SM9F6.1448.230111 b/.coverage.LAPTOP-K50SM9F6.1448.230111
diff --git a/.coverage.LAPTOP-K50SM9F6.1449.189378 b/.coverage.LAPTOP-K50SM9F6.1449.189378
diff --git a/.coverage.LAPTOP-K50SM9F6.1450.530450 b/.coverage.LAPTOP-K50SM9F6.1450.530450
diff --git a/.coverage.LAPTOP-K50SM9F6.1451.296391 b/.coverage.LAPTOP-K50SM9F6.1451.296391
diff --git a/.coverage.LAPTOP-K50SM9F6.1452.097677 b/.coverage.LAPTOP-K50SM9F6.1452.097677
diff --git a/.coverage.LAPTOP-K50SM9F6.1453.158513 b/.coverage.LAPTOP-K50SM9F6.1453.158513
diff --git a/tests/data/gitignore_levels_tests/.gitignore b/tests/data/gitignore_levels_tests/.gitignore
diff --git a/tests/data/gitignore_levels_tests/child_dir/.gitignore b/tests/data/gitignore_levels_tests/child_dir/.gitignore
diff --git a/tests/data/gitignore_levels_tests/child_dir/ignored_in_child.py b/tests/data/gitignore_levels_tests/child_dir/ignored_in_child.py
diff --git a/tests/data/gitignore_levels_tests/child_dir/ignored_in_root.py b/tests/data/gitignore_levels_tests/child_dir/ignored_in_root.py
diff --git a/tests/data/gitignore_levels_tests/ignored_in_root.py b/tests/data/gitignore_levels_tests/ignored_in_root.py
diff --git a/tests/data/nested_gitignore_tests/pyproject.toml b/tests/data/nested_gitignore_tests/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=41.0", "setuptools-scm", "wheel"]
+build-backend = "setuptools.build_meta"
diff --git a/tests/data/nested_gitignore_tests/root/.gitignore b/tests/data/nested_gitignore_tests/root/.gitignore
@@ -0,0 +1 @@
+a.py
diff --git a/...ignore_levels_tests/child_dir/included.py → tests/data/nested_gitignore_tests/root/b.py b/...ignore_levels_tests/child_dir/included.py → tests/data/nested_gitignore_tests/root/b.py
diff --git a/...itignore_levels_tests/ignored_in_child.py → tests/data/nested_gitignore_tests/root/c.py b/...itignore_levels_tests/ignored_in_child.py → tests/data/nested_gitignore_tests/root/c.py
diff --git a/tests/data/nested_gitignore_tests/root/child/.gitignore b/tests/data/nested_gitignore_tests/root/child/.gitignore
@@ -0,0 +1 @@
+b.py
diff --git a/...s/data/gitignore_levels_tests/included.py → ...ta/nested_gitignore_tests/root/child/c.py b/...s/data/gitignore_levels_tests/included.py → ...ta/nested_gitignore_tests/root/child/c.py
diff --git a/tests/test_black.py b/tests/test_black.py
@@ -1703,16 +1703,16 @@ def test_gitignore_exclude(self) -> None:
         )
         self.assertEqual(sorted(expected), sorted(sources))
 
-    def test_respect_gitignore_levels(self) -> None:
-        path = Path(THIS_DIR / "data" / "gitignore_levels_tests")
+    def test_nested_gitignore(self) -> None:
+        path = Path(THIS_DIR / "data" / "nested_gitignore_tests")
         include = re.compile(r"\.pyi?$")
         exclude = re.compile(r"")
         root_gitignore = black.files.get_gitignore(path)
         report = black.Report()
         expected: List[Path] = [
-            Path(path / "included.py"),
-            Path(path / "ignored_in_child.py"),
-            Path(path / "child_dir/included.py"),
+            Path(path / "root/b.py"),
+            Path(path / "root/c.py"),
+            Path(path / "root/child/c.py"),
         ]
         this_abs = THIS_DIR.resolve()
         sources = list(