]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
test/pytest_suite: restore missing fixtures, fix exec bits, add svn:ignore
authorJim Jagielski <jim@apache.org>
Wed, 3 Jun 2026 18:58:05 +0000 (18:58 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 3 Jun 2026 18:58:05 +0000 (18:58 +0000)
Bring the pytest suite to parity with the canonical source:

* Add 25 previously-missing test fixture files (deflate images, expires
  placeholders, data PNG, rewrite dbm, ssl .pfa placeholders, .empty
  dir-keepers, headers htaccess) that several module tests require; their
  absence caused spurious 404 failures.

* Set svn:executable on the CGI/shell/perl scripts (and the negotiation
  and xbithack content files that carry the bit upstream) so CGI tests no
  longer fail with 500 on a fresh checkout.

* Stop tracking the .htaccess/htpasswd files that the tests rewrite at run
  time (setenvif/htaccess/.htaccess, autoindex2/dir_broken/.htaccess,
  autoindex2/dir_protected/htpasswd) and add svn:ignore for them, matching
  the original Perl Apache::Test framework which never versioned them.

* Add per-directory svn:ignore for c-module build artifacts, generated
  t/conf configs, generated CGI scripts and runtime dirs, plus a recursive
  svn:global-ignores for Python caches (__pycache__, *.pyc, .venv, etc.).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934943 13f79535-47bb-0310-9956-ffa450edef68

77 files changed:
test/pytest_suite/runtests.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/apache/acceptpathinfo/off/test.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/apache/acceptpathinfo/on/test.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/apache/acceptpathinfo/test.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/expr/zero [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/actions/action/dummy.txt [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/actions/script/dummy.txt [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/alias/script [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/allowmethods/Get/none/.empty [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/allowmethods/NoPost/.empty [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/allowmethods/Post/reset/.empty [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/autoindex2/dir_broken/.htaccess [deleted file]
test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/htpasswd [deleted file]
test/pytest_suite/t/htdocs/modules/cgi/acceptpathinfodefault.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/acceptpathinfooff.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/acceptpathinfoon.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/action.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/bogus-sh.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/bogus-te.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/cgi/sh.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/data/SupportApache-small.png [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/deflate/apache_pb.gif [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/deflate/asf_logo_wide.jpg [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/deflate/zero.txt [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/foo.jpg [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/htaccess/foo.jpg [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/htaccess/image.gif [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/htaccess/text.txt [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/image.gif [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/expires/text.txt [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/headers/htaccess/.htaccess [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/headers/htaccess/index.html [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/include/comment.shtml [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/mod_request/echo.shtml [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/mod_request/post.shtml [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/xbithack/both/timefmt.shtml [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/xbithack/full/test.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/xbithack/off/test.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/include/xbithack/on/test.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/de/compressed/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/de/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/de/two/index.zh-TW.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/en/compressed/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/en/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/en/two/index.zh-TW.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fr/compressed/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fr/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fr/two/index.zh-TW.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fu/compressed/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fu/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/fu/two/index.zh-TW.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/compressed/index.html.de [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/compressed/index.html.en [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/compressed/index.html.fr [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/compressed/index.html.fu [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/compressed/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/index.html.de [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/index.html.en [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/index.html.fr [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/index.html.fu [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/index.html.zh-TW [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/index.de.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/index.en.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/index.fr.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/index.fu.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/index.zh-TW.html [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/negotiation/zh-TW/two/map.var [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/rewrite/numbers.dbm.db [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/ssl/aes128/empty.pfa [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/ssl/aes256/empty.pfa [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/substitute/.empty [new file with mode: 0644]
test/pytest_suite/t/htdocs/modules/vhost_alias/ab.com/test-cgi.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/vhost_alias/big.server.name.from.heck.org/test-cgi.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/vhost_alias/w-t-f.net/test-cgi.sh [changed mode: 0644->0755]
test/pytest_suite/t/htdocs/modules/vhost_alias/www.vha-test.com/test-cgi.sh [changed mode: 0644->0755]
test/pytest_suite/t/php-fpm/fcgi.pl [changed mode: 0644->0755]
test/pytest_suite/t/php-fpm/pools/www/.empty [new file with mode: 0644]

old mode 100644 (file)
new mode 100755 (executable)
diff --git a/test/pytest_suite/t/htdocs/expr/zero b/test/pytest_suite/t/htdocs/expr/zero
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/actions/action/dummy.txt b/test/pytest_suite/t/htdocs/modules/actions/action/dummy.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/actions/script/dummy.txt b/test/pytest_suite/t/htdocs/modules/actions/script/dummy.txt
new file mode 100644 (file)
index 0000000..e69de29
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/test/pytest_suite/t/htdocs/modules/allowmethods/Get/none/.empty b/test/pytest_suite/t/htdocs/modules/allowmethods/Get/none/.empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/allowmethods/NoPost/.empty b/test/pytest_suite/t/htdocs/modules/allowmethods/NoPost/.empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/allowmethods/Post/reset/.empty b/test/pytest_suite/t/htdocs/modules/allowmethods/Post/reset/.empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_broken/.htaccess b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_broken/.htaccess
deleted file mode 100644 (file)
index 80fada3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This_is_a_broken_on_purpose_.htaccess_file
\ No newline at end of file
diff --git a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/htpasswd b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/htpasswd
deleted file mode 100644 (file)
index f500dab..0000000
+++ /dev/null
@@ -1 +0,0 @@
-nobody:HIoD8SxAgkCdQ
\ No newline at end of file
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/test/pytest_suite/t/htdocs/modules/data/SupportApache-small.png b/test/pytest_suite/t/htdocs/modules/data/SupportApache-small.png
new file mode 100644 (file)
index 0000000..4a23e05
Binary files /dev/null and b/test/pytest_suite/t/htdocs/modules/data/SupportApache-small.png differ
diff --git a/test/pytest_suite/t/htdocs/modules/deflate/apache_pb.gif b/test/pytest_suite/t/htdocs/modules/deflate/apache_pb.gif
new file mode 100644 (file)
index 0000000..3a1c139
Binary files /dev/null and b/test/pytest_suite/t/htdocs/modules/deflate/apache_pb.gif differ
diff --git a/test/pytest_suite/t/htdocs/modules/deflate/asf_logo_wide.jpg b/test/pytest_suite/t/htdocs/modules/deflate/asf_logo_wide.jpg
new file mode 100644 (file)
index 0000000..82505e3
Binary files /dev/null and b/test/pytest_suite/t/htdocs/modules/deflate/asf_logo_wide.jpg differ
diff --git a/test/pytest_suite/t/htdocs/modules/deflate/zero.txt b/test/pytest_suite/t/htdocs/modules/deflate/zero.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/foo.jpg b/test/pytest_suite/t/htdocs/modules/expires/foo.jpg
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/htaccess/foo.jpg b/test/pytest_suite/t/htdocs/modules/expires/htaccess/foo.jpg
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/htaccess/image.gif b/test/pytest_suite/t/htdocs/modules/expires/htaccess/image.gif
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/htaccess/text.txt b/test/pytest_suite/t/htdocs/modules/expires/htaccess/text.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/image.gif b/test/pytest_suite/t/htdocs/modules/expires/image.gif
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/expires/text.txt b/test/pytest_suite/t/htdocs/modules/expires/text.txt
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/headers/htaccess/.htaccess b/test/pytest_suite/t/htdocs/modules/headers/htaccess/.htaccess
new file mode 100644 (file)
index 0000000..548c9ff
--- /dev/null
@@ -0,0 +1,2 @@
+Header echo Test-Header
+Header edit* Test-Header ^(.*)$ $1;httpOnly;secure
\ No newline at end of file
diff --git a/test/pytest_suite/t/htdocs/modules/headers/htaccess/index.html b/test/pytest_suite/t/htdocs/modules/headers/htaccess/index.html
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/rewrite/numbers.dbm.db b/test/pytest_suite/t/htdocs/modules/rewrite/numbers.dbm.db
new file mode 100644 (file)
index 0000000..ed20201
Binary files /dev/null and b/test/pytest_suite/t/htdocs/modules/rewrite/numbers.dbm.db differ
diff --git a/test/pytest_suite/t/htdocs/modules/ssl/aes128/empty.pfa b/test/pytest_suite/t/htdocs/modules/ssl/aes128/empty.pfa
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/ssl/aes256/empty.pfa b/test/pytest_suite/t/htdocs/modules/ssl/aes256/empty.pfa
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/test/pytest_suite/t/htdocs/modules/substitute/.empty b/test/pytest_suite/t/htdocs/modules/substitute/.empty
new file mode 100644 (file)
index 0000000..e69de29
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/test/pytest_suite/t/php-fpm/pools/www/.empty b/test/pytest_suite/t/php-fpm/pools/www/.empty
new file mode 100644 (file)
index 0000000..e69de29