From a5b64c98af1f898f95484010e0eb67f3ef4d6c3d Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 13 Dec 2017 23:46:57 +0900
Subject: [PATCH] diet test-root: Remove html_static_path and html_extra_path
 (duplicated with test-html_assets)

---
 tests/roots/test-root/_static/README         |  1 -
 tests/roots/test-root/_static/excluded.css   |  1 -
 tests/roots/test-root/_static/subdir/foo.css |  1 -
 tests/roots/test-root/conf.py                |  2 --
 tests/roots/test-root/robots.txt             |  2 --
 tests/roots/test-root/templated.css_t        |  2 --
 tests/test_build_html.py                     | 27 --------------------
 7 files changed, 36 deletions(-)
 delete mode 100644 tests/roots/test-root/_static/README
 delete mode 100644 tests/roots/test-root/_static/excluded.css
 delete mode 100644 tests/roots/test-root/_static/subdir/foo.css
 delete mode 100644 tests/roots/test-root/robots.txt
 delete mode 100644 tests/roots/test-root/templated.css_t

diff --git a/tests/roots/test-root/_static/README b/tests/roots/test-root/_static/README
deleted file mode 100644
index 9e1ec3569..000000000
--- a/tests/roots/test-root/_static/README
+++ /dev/null
@@ -1 +0,0 @@
-This whole directory is there to test html_static_path.
diff --git a/tests/roots/test-root/_static/excluded.css b/tests/roots/test-root/_static/excluded.css
deleted file mode 100644
index 03c941a44..000000000
--- a/tests/roots/test-root/_static/excluded.css
+++ /dev/null
@@ -1 +0,0 @@
-/* This file should be excluded from being copied over */
diff --git a/tests/roots/test-root/_static/subdir/foo.css b/tests/roots/test-root/_static/subdir/foo.css
deleted file mode 100644
index 9427981d6..000000000
--- a/tests/roots/test-root/_static/subdir/foo.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Stub file */
diff --git a/tests/roots/test-root/conf.py b/tests/roots/test-root/conf.py
index c25beb9f1..bd3cb9a9b 100644
--- a/tests/roots/test-root/conf.py
+++ b/tests/roots/test-root/conf.py
@@ -33,8 +33,6 @@ html_sidebars = {'**': 'customsb.html',
                  'contents': ['contentssb.html', 'localtoc.html',
                               'globaltoc.html']}
 html_style = 'default.css'
-html_static_path = ['_static', 'templated.css_t']
-html_extra_path = ['robots.txt']
 html_last_updated_fmt = '%b %d, %Y'
 html_context = {'hckey': 'hcval', 'hckey_co': 'wrong_hcval_co'}
 
diff --git a/tests/roots/test-root/robots.txt b/tests/roots/test-root/robots.txt
deleted file mode 100644
index 1b425ee0f..000000000
--- a/tests/roots/test-root/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /cgi-bin/
diff --git a/tests/roots/test-root/templated.css_t b/tests/roots/test-root/templated.css_t
deleted file mode 100644
index 72ddb807c..000000000
--- a/tests/roots/test-root/templated.css_t
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Stub file, templated */
-{{ sphinx_version }}
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 6fa769b8b..c27dad42b 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -126,24 +126,6 @@ def check_xpath(etree, fname, path, check, be_found=True):
                                               [node.text for node in nodes]))
 
 
-def check_static_entries(outdir):
-    staticdir = outdir / '_static'
-    assert staticdir.isdir()
-    # a file from a directory entry in html_static_path
-    assert (staticdir / 'README').isfile()
-    # a directory from a directory entry in html_static_path
-    assert (staticdir / 'subdir' / 'foo.css').isfile()
-    # a file from a file entry in html_static_path
-    assert (staticdir / 'templated.css').isfile()
-    assert (staticdir / 'templated.css').text().splitlines()[1] == __display_version__
-    # a file from _static, but matches exclude_patterns
-    assert not (staticdir / 'excluded.css').exists()
-
-
-def check_extra_entries(outdir):
-    assert (outdir / 'robots.txt').isfile()
-
-
 @pytest.mark.sphinx('html', testroot='warnings')
 def test_html_warnings(app, warning):
     app.build()
@@ -156,15 +138,6 @@ def test_html_warnings(app, warning):
         '--- Got:\n' + html_warnings
 
 
-@pytest.mark.sphinx('html', tags=['testtag'], confoverrides={
-    'html_context.hckey_co': 'hcval_co'})
-@pytest.mark.test_params(shared_result='test_build_html_output')
-def test_static_output(app):
-    app.build()
-    check_static_entries(app.builder.outdir)
-    check_extra_entries(app.builder.outdir)
-
-
 @pytest.mark.parametrize("fname,expect", flat_dict({
     'images.html': [
         (".//img[@src='_images/img.png']", ''),