You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by rr...@apache.org on 2020/03/24 20:57:01 UTC
[trafficserver] branch master updated: Removes copypasta curl text
from tests and removes checks for curl
This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new c623884 Removes copypasta curl text from tests and removes checks for curl
c623884 is described below
commit c623884e6e608d7a300f9896eb35107188d0f789
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Tue Mar 24 10:56:25 2020 -0700
Removes copypasta curl text from tests and removes checks for curl
It was decided that curl and nc are a base requirement for autest back in
6c1a90f4f209a02cf1345ac4c20e2e67c4c58db1
---
tests/gold_tests/cache/cache-generation-disjoint.test.py | 2 +-
tests/gold_tests/chunked_encoding/chunked_encoding.test.py | 2 +-
tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py | 4 +---
tests/gold_tests/h2/h2disable.test.py | 1 -
tests/gold_tests/h2/h2disable_no_accept_threads.test.py | 1 -
tests/gold_tests/h2/h2enable.test.py | 1 -
tests/gold_tests/h2/h2enable_no_accept_threads.test.py | 1 -
tests/gold_tests/h2/http2.test.py | 2 +-
tests/gold_tests/h2/http2_priority.test.py | 1 -
tests/gold_tests/h2/nghttp.test.py | 2 +-
tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py | 2 +-
tests/gold_tests/timeout/active_timeout.test.py | 1 -
tests/gold_tests/timeout/inactive_timeout.test.py | 1 -
tests/gold_tests/tls/tls_client_versions.test.py | 1 -
14 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/tests/gold_tests/cache/cache-generation-disjoint.test.py b/tests/gold_tests/cache/cache-generation-disjoint.test.py
index 7c6bd21..e6da37b 100644
--- a/tests/gold_tests/cache/cache-generation-disjoint.test.py
+++ b/tests/gold_tests/cache/cache-generation-disjoint.test.py
@@ -21,7 +21,7 @@ import uuid
Test.Summary = '''
Test that the same URL path in different cache generations creates disjoint objects
'''
-# need Curl
+
Test.ContinueOnFail = True
# Define default ATS
ts = Test.MakeATSProcess("ts")
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 9037778..60cd4dc 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -19,7 +19,7 @@
Test.Summary = '''
Test chunked encoding processing
'''
-# need Curl with HTTP/2
+
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index 1cd9297..75d8a79 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -20,11 +20,9 @@ import os
Test.Summary = '''
Test interaction of H2 and chunked encoding
'''
-# need Curl
+
Test.SkipUnless(
Condition.HasProgram("nghttp", "Nghttp need to be installed on system for this test to work"),
- Condition.HasProgram("nc", "Nc needs to be installed on this system for this test to work"),
- Condition.HasProgram("curl", "Curl need to be installed on system for this test to work"),
Condition.HasCurlFeature('http2')
)
Test.ContinueOnFail = True
diff --git a/tests/gold_tests/h2/h2disable.test.py b/tests/gold_tests/h2/h2disable.test.py
index 0b0ac8b..3fdc0e3 100644
--- a/tests/gold_tests/h2/h2disable.test.py
+++ b/tests/gold_tests/h2/h2disable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
Test disabling H2 on a per domain basis
'''
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
index 8d805af..fe508a6 100644
--- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
Test disabling H2 on a per domain basis
'''
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/h2/h2enable.test.py b/tests/gold_tests/h2/h2enable.test.py
index cb6658b..efcaf34 100644
--- a/tests/gold_tests/h2/h2enable.test.py
+++ b/tests/gold_tests/h2/h2enable.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
Test enabling H2 on a per domain basis
'''
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
index 85be0ec..ec8f82b 100644
--- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
Test enabling H2 on a per domain basis
'''
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index c0ff4b3..2ee5ce5 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -20,7 +20,7 @@ import os
Test.Summary = '''
Test a basic remap of a http/2 connection
'''
-# need Curl
+
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/h2/http2_priority.test.py b/tests/gold_tests/h2/http2_priority.test.py
index 6b30c88..d3f5581 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -20,7 +20,6 @@ Test.Summary = '''
Test a basic remap of a http connection with Stream Priority Feature
'''
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2'),
Condition.HasProgram("shasum", "shasum need to be installed on system for this test to work"),
diff --git a/tests/gold_tests/h2/nghttp.test.py b/tests/gold_tests/h2/nghttp.test.py
index 72cc51f..2e149a6 100644
--- a/tests/gold_tests/h2/nghttp.test.py
+++ b/tests/gold_tests/h2/nghttp.test.py
@@ -20,7 +20,7 @@ import os
Test.Summary = '''
Test with nghttp
'''
-# need Curl
+
Test.SkipUnless(
Condition.HasProgram("nghttp", "Nghttp need to be installed on system for this test to work"),
)
diff --git a/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py b/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py
index 69af2bf..b634af4 100644
--- a/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py
+++ b/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py
@@ -19,7 +19,7 @@
Test.Summary = '''
Test experimental/multiplexer.
'''
-# need Curl
+
Test.SkipUnless(
Condition.PluginExists('multiplexer.so')
)
diff --git a/tests/gold_tests/timeout/active_timeout.test.py b/tests/gold_tests/timeout/active_timeout.test.py
index ef2c25f..b3b0e36 100644
--- a/tests/gold_tests/timeout/active_timeout.test.py
+++ b/tests/gold_tests/timeout/active_timeout.test.py
@@ -18,7 +18,6 @@
Test.Summary = 'Testing ATS active timeout'
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/timeout/inactive_timeout.test.py b/tests/gold_tests/timeout/inactive_timeout.test.py
index 3076274..33e22e8 100644
--- a/tests/gold_tests/timeout/inactive_timeout.test.py
+++ b/tests/gold_tests/timeout/inactive_timeout.test.py
@@ -18,7 +18,6 @@
Test.Summary = 'Testing ATS inactivity timeout'
-# need Curl
Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
diff --git a/tests/gold_tests/tls/tls_client_versions.test.py b/tests/gold_tests/tls/tls_client_versions.test.py
index f351b98..2c44f4c 100644
--- a/tests/gold_tests/tls/tls_client_versions.test.py
+++ b/tests/gold_tests/tls/tls_client_versions.test.py
@@ -23,7 +23,6 @@ Test TLS protocol offering based on SNI
# By default only offer TLSv1_2
# for special doman foo.com only offer TLSv1 and TLSv1_1
-# need Curl
Test.SkipUnless(
Condition.HasOpenSSLVersion("1.1.1")
)