summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2017-03-24 09:44:36 +0000
committerEric Wieser <wieser.eric@gmail.com>2017-03-24 09:51:50 +0000
commit18d2e2e48be136a38cf39bc0640db893e72587b5 (patch)
tree0bd9c5acba9ce1f786ae8622d10751ad4f94116c
parent3e7bee583604e3422c05f807a69d0a73afedfa59 (diff)
downloadsphinx-git-18d2e2e48be136a38cf39bc0640db893e72587b5.tar.gz
Move apidoc tests to subfolder, rather than polluting main test
-rw-r--r--tests/roots/test-apidoc-pep420/a/b/c/__init__.py (renamed from tests/root/pep_0420/a/b/c/__init__.py)0
-rw-r--r--tests/roots/test-apidoc-pep420/a/b/c/d.py (renamed from tests/root/pep_0420/a/b/c/d.py)0
-rw-r--r--tests/roots/test-apidoc-pep420/a/b/x/y.py (renamed from tests/root/pep_0420/a/b/x/y.py)0
-rw-r--r--tests/roots/test-apidoc-trailing-underscore/package_/__init__.py (renamed from tests/root/trailing_underscore/package_/__init__.py)0
-rw-r--r--tests/roots/test-apidoc-trailing-underscore/package_/module_.py (renamed from tests/root/trailing_underscore/package_/module_.py)0
-rw-r--r--tests/test_apidoc.py10
6 files changed, 6 insertions, 4 deletions
diff --git a/tests/root/pep_0420/a/b/c/__init__.py b/tests/roots/test-apidoc-pep420/a/b/c/__init__.py
index 619273942..619273942 100644
--- a/tests/root/pep_0420/a/b/c/__init__.py
+++ b/tests/roots/test-apidoc-pep420/a/b/c/__init__.py
diff --git a/tests/root/pep_0420/a/b/c/d.py b/tests/roots/test-apidoc-pep420/a/b/c/d.py
index 6b0b45d90..6b0b45d90 100644
--- a/tests/root/pep_0420/a/b/c/d.py
+++ b/tests/roots/test-apidoc-pep420/a/b/c/d.py
diff --git a/tests/root/pep_0420/a/b/x/y.py b/tests/roots/test-apidoc-pep420/a/b/x/y.py
index 8b49b2079..8b49b2079 100644
--- a/tests/root/pep_0420/a/b/x/y.py
+++ b/tests/roots/test-apidoc-pep420/a/b/x/y.py
diff --git a/tests/root/trailing_underscore/package_/__init__.py b/tests/roots/test-apidoc-trailing-underscore/package_/__init__.py
index b09612b83..b09612b83 100644
--- a/tests/root/trailing_underscore/package_/__init__.py
+++ b/tests/roots/test-apidoc-trailing-underscore/package_/__init__.py
diff --git a/tests/root/trailing_underscore/package_/module_.py b/tests/roots/test-apidoc-trailing-underscore/package_/module_.py
index 9902551ee..9902551ee 100644
--- a/tests/root/trailing_underscore/package_/module_.py
+++ b/tests/roots/test-apidoc-trailing-underscore/package_/module_.py
diff --git a/tests/test_apidoc.py b/tests/test_apidoc.py
index d161fcd05..313ee9844 100644
--- a/tests/test_apidoc.py
+++ b/tests/test_apidoc.py
@@ -62,7 +62,7 @@ def test_simple(make_app, apidoc):
@pytest.mark.apidoc(
- coderoot=(rootdir / 'root' / 'pep_0420'),
+ coderoot=(rootdir / 'roots' / 'test-apidoc-pep420'),
options=["--implicit-namespaces"],
)
def test_pep_0420_enabled(make_app, apidoc):
@@ -89,7 +89,7 @@ def test_pep_0420_enabled(make_app, apidoc):
print(app._warning.getvalue())
-@pytest.mark.apidoc(coderoot=(rootdir / 'root' / 'pep_0420'))
+@pytest.mark.apidoc(coderoot=(rootdir / 'roots' / 'test-apidoc-pep420'))
def test_pep_0420_disabled(make_app, apidoc):
outdir = apidoc.outdir
assert (outdir / 'conf.py').isfile()
@@ -102,7 +102,8 @@ def test_pep_0420_disabled(make_app, apidoc):
print(app._warning.getvalue())
-@pytest.mark.apidoc(coderoot=(rootdir / 'root' / 'pep_0420' / 'a' / 'b'))
+@pytest.mark.apidoc(
+ coderoot=(rootdir / 'roots' / 'test-apidoc-pep420' / 'a' / 'b'))
def test_pep_0420_disabled_top_level_verify(make_app, apidoc):
outdir = apidoc.outdir
assert (outdir / 'conf.py').isfile()
@@ -120,7 +121,8 @@ def test_pep_0420_disabled_top_level_verify(make_app, apidoc):
print(app._status.getvalue())
print(app._warning.getvalue())
-@pytest.mark.apidoc(coderoot=(rootdir / 'root' / 'trailing_underscore'))
+@pytest.mark.apidoc(
+ coderoot=(rootdir / 'roots' / 'test-apidoc-trailing-underscore'))
def test_trailing_underscore(make_app, apidoc):
outdir = apidoc.outdir
assert (outdir / 'conf.py').isfile()