You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2023/05/02 10:04:22 UTC
svn commit: r1909563 - in /httpd/httpd/trunk: .github/workflows/linux.yml test/modules/http2/test_003_get.py test/travis_run_linux.sh
Author: icing
Date: Tue May 2 10:04:21 2023
New Revision: 1909563
URL: http://svn.apache.org/viewvc?rev=1909563&view=rev
Log:
tests, re-enable http/2 tests in github workflow, install latest rustls-ffi version
Modified:
httpd/httpd/trunk/.github/workflows/linux.yml
httpd/httpd/trunk/test/modules/http2/test_003_get.py
httpd/httpd/trunk/test/travis_run_linux.sh
Modified: httpd/httpd/trunk/.github/workflows/linux.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.github/workflows/linux.yml?rev=1909563&r1=1909562&r2=1909563&view=diff
==============================================================================
--- httpd/httpd/trunk/.github/workflows/linux.yml (original)
+++ httpd/httpd/trunk/.github/workflows/linux.yml Tue May 2 10:04:21 2023
@@ -195,20 +195,18 @@ jobs:
TEST_ASAN=1
CLEAR_CACHE=1
# -------------------------------------------------------------------------
- ### TODO: if: *condition_not_24x
- ### TODO: fails in tests.
- # - name: HTTP/2 test suite
- # config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=all
- # pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests
- # env: |
- # APR_VERSION=1.7.4
- # APU_VERSION=1.6.3
- # APU_CONFIG="--with-crypto"
- # NO_TEST_FRAMEWORK=1
- # TEST_INSTALL=1
- # TEST_H2=1
- # TEST_CORE=1
- # TEST_PROXY=1
+ - name: HTTP/2 test suite
+ config: --enable-mods-shared=reallyall --with-mpm=event --enable-mpms-shared=all
+ pkgs: curl python3-pytest nghttp2-client python3-cryptography python3-requests python3-multipart
+ env: |
+ APR_VERSION=1.7.4
+ APU_VERSION=1.6.3
+ APU_CONFIG="--with-crypto"
+ NO_TEST_FRAMEWORK=1
+ TEST_INSTALL=1
+ TEST_H2=1
+ TEST_CORE=1
+ TEST_PROXY=1
# -------------------------------------------------------------------------
### TODO: if: *condition_not_24x
### TODO: pebble install is broken.
Modified: httpd/httpd/trunk/test/modules/http2/test_003_get.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/http2/test_003_get.py?rev=1909563&r1=1909562&r2=1909563&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/http2/test_003_get.py (original)
+++ httpd/httpd/trunk/test/modules/http2/test_003_get.py Tue May 2 10:04:21 2023
@@ -210,7 +210,10 @@ content-type: text/html
assert "content-length" in h
clen = h["content-length"]
# get the first 1024 bytes of the resource, 206 status, but content-length as original
- r = env.curl_get(url, 5, options=["-H", "range: bytes=0-1023"])
+ for i in range(10):
+ r = env.curl_get(url, 5, options=["-H", "range: bytes=0-1023"])
+ if r.response["status"] != 503:
+ break
assert 206 == r.response["status"]
assert "HTTP/2" == r.response["protocol"]
assert 1024 == len(r.response["body"])
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1909563&r1=1909562&r2=1909563&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Tue May 2 10:04:21 2023
@@ -58,12 +58,9 @@ fi
# build the version we want from source
if test -v TEST_MOD_TLS; then
RUSTLS_HOME="$HOME/build/rustls-ffi"
- RUSTLS_VERSION="v0.9.0"
- git clone https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
+ RUSTLS_VERSION="v0.10.0"
+ git clone -b "$RUSTLS_VERSION" https://github.com/rustls/rustls-ffi.git "$RUSTLS_HOME"
pushd "$RUSTLS_HOME"
- # since v0.9.0, there is no longer a dependency on cbindgen
- git fetch origin
- git checkout tags/$RUSTLS_VERSION
make install DESTDIR="$PREFIX"
popd
CONFIG="$CONFIG --with-tls --with-rustls=$PREFIX"