This is an automated email from the ASF dual-hosted git repository.
dragon 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 a7be6ec Format python code with autopep8
a7be6ec is described below
commit a7be6ec083dc3d7aafd6f392b7dc841957d3a26a
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Mon Aug 28 09:35:55 2017 +0900
Format python code with autopep8
---
doc/conf.py | 4 +-
doc/ext/traffic-server.py | 17 ++--
tests/gold_tests/autest-site/ports.py | 6 +-
.../body_factory/http204_response.test.py | 8 +-
.../body_factory/http204_response_plugin.test.py | 6 +-
.../body_factory/http304_response.test.py | 2 +-
tests/gold_tests/h2/http2.test.py | 5 +-
.../headers/domain-blacklist-30x.test.py | 92 +++++++++++-----------
tests/gold_tests/headers/http408.test.py | 6 +-
tests/gold_tests/redirect/redirect.test.py | 24 +++---
tests/gold_tests/tls_hooks/tls_hooks12.test.py | 6 +-
tests/tools/tcp_408_client.py | 1 +
tests/tools/traffic-replay/Config.py | 2 +-
tests/tools/traffic-replay/RandomReplay.py | 13 +--
tests/tools/traffic-replay/WorkerTask.py | 2 +-
tests/tools/traffic-replay/__main__.py | 13 +--
tests/tools/traffic-replay/mainProcess.py | 2 +-
17 files changed, 108 insertions(+), 101 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 3927bd6..f152ac7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -335,9 +335,9 @@ latex_elements = {
#'preamble': '',
}
-if tags.has('latex_a4') :
+if tags.has('latex_a4'):
latex_elements['papersize'] = 'a4paper'
-elif tags.has('latex_paper') :
+elif tags.has('latex_paper'):
latex_elements['papersiize'] = 'letterpaper'
# Grouping the document tree into LaTeX files. List of tuples
diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py
index b5ef358..acc6ec1 100644
--- a/doc/ext/traffic-server.py
+++ b/doc/ext/traffic-server.py
@@ -38,14 +38,16 @@ import subprocess
import re
# 2/3 compat logic
-try :
+try:
basestring
- def is_string_type(s) :
+
+ def is_string_type(s):
return isinstance(s, basestring)
-except NameError :
- def is_string_type(s) :
+except NameError:
+ def is_string_type(s):
return isinstance(s, str)
+
class TSConfVar(std.Target):
"""
Description of a traffic server configuration variable.
@@ -201,7 +203,7 @@ class TSStat(std.Target):
field = nodes.field()
field.append(nodes.field_name(text=tag))
body = nodes.field_body()
- if is_string_type(value) :
+ if is_string_type(value):
body.append(sphinx.addnodes.compact_paragraph(text=value))
else:
body.append(value)
@@ -356,14 +358,15 @@ class TrafficServerDomain(Domain):
# Python 2/3 compat - iteritems is 2, items is 3
# Although perhaps the lists are small enough items could be used in
Python 2.
- try :
+ try:
{}.iteritems()
+
def get_objects(self):
for var, doc in self.data['cv'].iteritems():
yield var, var, 'cv', doc, var, 1
for var, doc in self.data['stat'].iteritems():
yield var, var, 'stat', doc, var, 1
- except AttributeError :
+ except AttributeError:
def get_objects(self):
for var, doc in self.data['cv'].items():
yield var, var, 'cv', doc, var, 1
diff --git a/tests/gold_tests/autest-site/ports.py
b/tests/gold_tests/autest-site/ports.py
index 1f26e7e..b8cf8bf 100644
--- a/tests/gold_tests/autest-site/ports.py
+++ b/tests/gold_tests/autest-site/ports.py
@@ -59,12 +59,12 @@ def setup_port_queue(amount=1000):
return
try:
# some docker setups don't have sbin setup correctly
- new_env= os.environ.copy()
- new_env['PATH']="/sbin:/usr/sbin:"+new_env['PATH']
+ new_env = os.environ.copy()
+ new_env['PATH'] = "/sbin:/usr/sbin:" + new_env['PATH']
dmin, dmax = subprocess.check_output(
["sysctl", "net.ipv4.ip_local_port_range"],
env=new_env
- ).decode().split("=")[1].split()
+ ).decode().split("=")[1].split()
dmin = int(dmin)
dmax = int(dmax)
except:
diff --git a/tests/gold_tests/body_factory/http204_response.test.py
b/tests/gold_tests/body_factory/http204_response.test.py
index 54d61dc..c9f9073 100644
--- a/tests/gold_tests/body_factory/http204_response.test.py
+++ b/tests/gold_tests/body_factory/http204_response.test.py
@@ -37,8 +37,8 @@ ts.Disk.records_config.update({
})
# Create a template body for a 204.
-body_factory_dir=ts.Variables.BODY_FACTORY_TEMPLATE_DIR
-ts.Disk.File(os.path.join(body_factory_dir, 'default',
CUSTOM_TEMPLATE_204_HOST+'_default')).\
+body_factory_dir = ts.Variables.BODY_FACTORY_TEMPLATE_DIR
+ts.Disk.File(os.path.join(body_factory_dir, 'default',
CUSTOM_TEMPLATE_204_HOST + '_default')).\
WriteOn(
"""<HTML>
<HEAD>
@@ -61,11 +61,11 @@ regex_remap_conf_file = "maps.reg"
ts.Disk.remap_config.AddLine(
'map http://{0} http://127.0.0.1:{1} @plugin=regex_remap.so @pparam={2}
@pparam=no-query-string @pparam=host'
.format(DEFAULT_204_HOST, server.Variables.Port,
regex_remap_conf_file)
- )
+)
ts.Disk.remap_config.AddLine(
'map http://{0} http://127.0.0.1:{1} @plugin=regex_remap.so @pparam={2}
@pparam=no-query-string @pparam=host @plugin=conf_remap.so
@pparam=proxy.config.body_factory.template_base={0}'
.format(CUSTOM_TEMPLATE_204_HOST, server.Variables.Port,
regex_remap_conf_file)
- )
+)
ts.Disk.MakeConfigFile(regex_remap_conf_file).AddLine(
'//.*/ http://127.0.0.1:{0} @status=204'
.format(server.Variables.Port)
diff --git a/tests/gold_tests/body_factory/http204_response_plugin.test.py
b/tests/gold_tests/body_factory/http204_response_plugin.test.py
index a2ec580..7c8036b 100644
--- a/tests/gold_tests/body_factory/http204_response_plugin.test.py
+++ b/tests/gold_tests/body_factory/http204_response_plugin.test.py
@@ -34,9 +34,9 @@ regex_remap_conf_file = "maps.reg"
ts.Disk.remap_config.AddLine(
'map http://{0} http://127.0.0.1:{1} @plugin=regex_remap.so @pparam={2}
@pparam=no-query-string @pparam=host'
- .format(CUSTOM_PLUGIN_204_HOST, server.Variables.Port,
- regex_remap_conf_file)
- )
+ .format(CUSTOM_PLUGIN_204_HOST, server.Variables.Port,
+ regex_remap_conf_file)
+)
ts.Disk.MakeConfigFile(regex_remap_conf_file).AddLine('//.*/
http://donotcare.test @status=204')
Test.prepare_plugin(os.path.join(Test.Variables.AtsTestToolsDir, 'plugins',
'custom204plugin.cc'), ts)
diff --git a/tests/gold_tests/body_factory/http304_response.test.py
b/tests/gold_tests/body_factory/http304_response.test.py
index ed672a6..84dadbc 100644
--- a/tests/gold_tests/body_factory/http304_response.test.py
+++ b/tests/gold_tests/body_factory/http304_response.test.py
@@ -37,7 +37,7 @@ regex_remap_conf_file = "maps.reg"
ts.Disk.remap_config.AddLine(
'map http://{0} http://127.0.0.1:{1} @plugin=regex_remap.so @pparam={2}
@pparam=no-query-string @pparam=host'
.format(DEFAULT_304_HOST, server.Variables.Port,
regex_remap_conf_file)
- )
+)
ts.Disk.MakeConfigFile(regex_remap_conf_file).AddLine(
'//.*/ http://127.0.0.1:{0} @status=304'
.format(server.Variables.Port)
diff --git a/tests/gold_tests/h2/http2.test.py
b/tests/gold_tests/h2/http2.test.py
index ddae58b..c86a988 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -102,9 +102,10 @@ tr.Processes.Default.Streams.stdout = "gold/chunked.gold"
tr.StillRunningAfter = server
# Test Case 4: Multiple request
-client_path= os.path.join(Test.Variables.AtsTestToolsDir,'traffic-replay/')
+client_path = os.path.join(Test.Variables.AtsTestToolsDir, 'traffic-replay/')
tr = Test.AddTestRun()
-tr.Processes.Default.Command = "python3 {0} -type {1} -log_dir {2} -port {3}
-host '127.0.0.1' -s_port {4} -v -colorize False".format(client_path, 'h2',
server.Variables.DataDir, ts.Variables.port,ts.Variables.ssl_port)
+tr.Processes.Default.Command = "python3 {0} -type {1} -log_dir {2} -port {3}
-host '127.0.0.1' -s_port {4} -v -colorize False".format(
+ client_path, 'h2', server.Variables.DataDir, ts.Variables.port,
ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/replay.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/headers/domain-blacklist-30x.test.py
b/tests/gold_tests/headers/domain-blacklist-30x.test.py
index 172ccf4..5d412d5 100644
--- a/tests/gold_tests/headers/domain-blacklist-30x.test.py
+++ b/tests/gold_tests/headers/domain-blacklist-30x.test.py
@@ -23,23 +23,23 @@ Test.Summary = '''
Tests 30x responses are returned for matching domains
'''
-Test.SkipUnless(Condition.HasProgram("grep","grep needs to be installed on
system for this test to work"))
+Test.SkipUnless(Condition.HasProgram("grep", "grep needs to be installed on
system for this test to work"))
-ts=Test.MakeATSProcess("ts")
-server=Test.MakeOriginServer("server")
+ts = Test.MakeATSProcess("ts")
+server = Test.MakeOriginServer("server")
-REDIRECT_301_HOST='www.redirect301.test'
-REDIRECT_302_HOST='www.redirect302.test'
-REDIRECT_307_HOST='www.redirect307.test'
-REDIRECT_308_HOST='www.redirect308.test'
-REDIRECT_0_HOST='www.redirect0.test'
-PASSTHRU_HOST='www.passthrough.test'
+REDIRECT_301_HOST = 'www.redirect301.test'
+REDIRECT_302_HOST = 'www.redirect302.test'
+REDIRECT_307_HOST = 'www.redirect307.test'
+REDIRECT_308_HOST = 'www.redirect308.test'
+REDIRECT_0_HOST = 'www.redirect0.test'
+PASSTHRU_HOST = 'www.passthrough.test'
ts.Disk.records_config.update({
- 'proxy.config.diags.debug.enabled': 1,
- 'proxy.config.diags.debug.tags': 'header_rewrite|dbg_header_rewrite',
- 'proxy.config.body_factory.enable_logging': 1,
- })
+ 'proxy.config.diags.debug.enabled': 1,
+ 'proxy.config.diags.debug.tags': 'header_rewrite|dbg_header_rewrite',
+ 'proxy.config.body_factory.enable_logging': 1,
+})
ts.Disk.remap_config.AddLine("""\
regex_map http://{0}/ http://{0}/ @plugin=header_rewrite.so
@pparam=header_rewrite_rules_301.conf
@@ -50,65 +50,65 @@ regex_map http://{4}/ http://{4}/ @plugin=header_rewrite.so
@pparam=header_rewri
""".format(REDIRECT_301_HOST, REDIRECT_302_HOST, REDIRECT_307_HOST,
REDIRECT_308_HOST, REDIRECT_0_HOST)
)
-for x in (0,301,302,307,308):
-
ts.Disk.MakeConfigFile("header_rewrite_rules_{0}.conf".format(x)).AddLine("""\
+for x in (0, 301, 302, 307, 308):
+
ts.Disk.MakeConfigFile("header_rewrite_rules_{0}.conf".format(x)).AddLine("""\
set-redirect {0} "%<cque>"
""".format(x))
-Test.Setup.Copy(os.path.join(os.pardir,os.pardir,'tools','tcp_client.py'))
+Test.Setup.Copy(os.path.join(os.pardir, os.pardir, 'tools', 'tcp_client.py'))
Test.Setup.Copy('data')
-redirect301tr=Test.AddTestRun("Test domain {0}".format(REDIRECT_301_HOST))
+redirect301tr = Test.AddTestRun("Test domain {0}".format(REDIRECT_301_HOST))
redirect301tr.Processes.Default.StartBefore(Test.Processes.ts)
redirect301tr.StillRunningAfter = ts
-redirect301tr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
+redirect301tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(REDIRECT_301_HOST))
-redirect301tr.Processes.Default.TimeOut=5 # seconds
-redirect301tr.Processes.Default.ReturnCode=0
-redirect301tr.Processes.Default.Streams.stdout="redirect301_get.gold"
+redirect301tr.Processes.Default.TimeOut = 5 # seconds
+redirect301tr.Processes.Default.ReturnCode = 0
+redirect301tr.Processes.Default.Streams.stdout = "redirect301_get.gold"
-redirect302tr=Test.AddTestRun("Test domain {0}".format(REDIRECT_302_HOST))
+redirect302tr = Test.AddTestRun("Test domain {0}".format(REDIRECT_302_HOST))
redirect302tr.StillRunningBefore = ts
redirect302tr.StillRunningAfter = ts
-redirect302tr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
+redirect302tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(REDIRECT_302_HOST))
-redirect302tr.Processes.Default.TimeOut=5 # seconds
-redirect302tr.Processes.Default.ReturnCode=0
-redirect302tr.Processes.Default.Streams.stdout="redirect302_get.gold"
+redirect302tr.Processes.Default.TimeOut = 5 # seconds
+redirect302tr.Processes.Default.ReturnCode = 0
+redirect302tr.Processes.Default.Streams.stdout = "redirect302_get.gold"
-redirect307tr=Test.AddTestRun("Test domain {0}".format(REDIRECT_307_HOST))
+redirect307tr = Test.AddTestRun("Test domain {0}".format(REDIRECT_307_HOST))
redirect302tr.StillRunningBefore = ts
redirect307tr.StillRunningAfter = ts
-redirect307tr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
+redirect307tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(REDIRECT_307_HOST))
-redirect307tr.Processes.Default.TimeOut=5 # seconds
-redirect307tr.Processes.Default.ReturnCode=0
-redirect307tr.Processes.Default.Streams.stdout="redirect307_get.gold"
+redirect307tr.Processes.Default.TimeOut = 5 # seconds
+redirect307tr.Processes.Default.ReturnCode = 0
+redirect307tr.Processes.Default.Streams.stdout = "redirect307_get.gold"
-redirect308tr=Test.AddTestRun("Test domain {0}".format(REDIRECT_308_HOST))
+redirect308tr = Test.AddTestRun("Test domain {0}".format(REDIRECT_308_HOST))
redirect308tr.StillRunningBefore = ts
redirect308tr.StillRunningAfter = ts
-redirect308tr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
+redirect308tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(REDIRECT_308_HOST))
-redirect308tr.Processes.Default.TimeOut=5 # seconds
-redirect308tr.Processes.Default.ReturnCode=0
-redirect308tr.Processes.Default.Streams.stdout="redirect308_get.gold"
+redirect308tr.Processes.Default.TimeOut = 5 # seconds
+redirect308tr.Processes.Default.ReturnCode = 0
+redirect308tr.Processes.Default.Streams.stdout = "redirect308_get.gold"
-redirect0tr=Test.AddTestRun("Test domain {0}".format(REDIRECT_0_HOST))
+redirect0tr = Test.AddTestRun("Test domain {0}".format(REDIRECT_0_HOST))
redirect0tr.StillRunningBefore = ts
redirect0tr.StillRunningAfter = ts
-redirect0tr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0} {1}
| grep -v '^Date: '| grep -v '^Server: ATS/'".\
+redirect0tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(REDIRECT_0_HOST))
-redirect0tr.Processes.Default.TimeOut=5 # seconds
-redirect0tr.Processes.Default.ReturnCode=0
-redirect0tr.Processes.Default.Streams.stdout="redirect0_get.gold"
+redirect0tr.Processes.Default.TimeOut = 5 # seconds
+redirect0tr.Processes.Default.ReturnCode = 0
+redirect0tr.Processes.Default.Streams.stdout = "redirect0_get.gold"
-passthroughtr=Test.AddTestRun("Test domain {0}".format(PASSTHRU_HOST))
+passthroughtr = Test.AddTestRun("Test domain {0}".format(PASSTHRU_HOST))
passthroughtr.StillRunningBefore = ts
passthroughtr.StillRunningAfter = ts
-passthroughtr.Processes.Default.Command="python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
+passthroughtr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0}
{1} | grep -v '^Date: '| grep -v '^Server: ATS/'".\
format(ts.Variables.port, 'data/{0}_get.txt'.format(PASSTHRU_HOST))
-passthroughtr.Processes.Default.TimeOut=5 # seconds
-passthroughtr.Processes.Default.ReturnCode=0
-passthroughtr.Processes.Default.Streams.stdout="passthrough_get.gold"
+passthroughtr.Processes.Default.TimeOut = 5 # seconds
+passthroughtr.Processes.Default.ReturnCode = 0
+passthroughtr.Processes.Default.Streams.stdout = "passthrough_get.gold"
diff --git a/tests/gold_tests/headers/http408.test.py
b/tests/gold_tests/headers/http408.test.py
index 9212023..7621c77 100644
--- a/tests/gold_tests/headers/http408.test.py
+++ b/tests/gold_tests/headers/http408.test.py
@@ -40,11 +40,11 @@ server.addResponse("sessionlog.json", request_header,
response_header)
ts.Disk.remap_config.AddLine(
'map http://www.example.com
http://127.0.0.1:{0}'.format(server.Variables.Port)
- )
+)
ts.Disk.records_config.update({
- 'proxy.config.http.transaction_no_activity_timeout_in' : 2,
- })
+ 'proxy.config.http.transaction_no_activity_timeout_in': 2,
+})
Test.Setup.Copy(os.path.join(os.pardir, os.pardir, 'tools',
'tcp_408_client.py'))
diff --git a/tests/gold_tests/redirect/redirect.test.py
b/tests/gold_tests/redirect/redirect.test.py
index db21599..ffb686d 100644
--- a/tests/gold_tests/redirect/redirect.test.py
+++ b/tests/gold_tests/redirect/redirect.test.py
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
+import os
Test.Summary = '''
Test basic redirection
'''
@@ -25,7 +25,7 @@ Test basic redirection
MAX_REDIRECT = 99
Test.SkipUnless(
- Condition.HasProgram("curl", "Curl need to be installed on system for
this test to work")
+ Condition.HasProgram("curl", "Curl need to be installed on system for this
test to work")
)
Test.ContinueOnFail = True
@@ -35,22 +35,23 @@ redirect_serv = Test.MakeOriginServer("re_server")
dest_serv = Test.MakeOriginServer("dest_server")
ts.Disk.records_config.update({
- 'proxy.config.http.redirection_enabled': 1,
- 'proxy.config.http.number_of_redirections': MAX_REDIRECT,
- 'proxy.config.http.cache.http': 0#,
- # 'proxy.config.diags.debug.enabled': 1
+ 'proxy.config.http.redirection_enabled': 1,
+ 'proxy.config.http.number_of_redirections': MAX_REDIRECT,
+ 'proxy.config.http.cache.http': 0 # ,
+ # 'proxy.config.diags.debug.enabled': 1
})
-redirect_request_header={"headers": "GET /redirect HTTP/1.1\r\nHost:
*\r\n\r\n", "timestamp": "5678", "body": ""}
-redirect_response_header={"headers": "HTTP/1.1 302 Found\r\nLocation:
http://127.0.0.1:{0}/redirectDest\r\n\r\n".format(dest_serv.Variables.Port),
"timestamp": "5678", "body": ""}
-dest_request_header={"headers": "GET /redirectDest HTTP/1.1\r\nHost:
*\r\n\r\n", "timestamp": "11", "body": ""}
-dest_response_header={"headers": "HTTP/1.1 204 No Content\r\n\r\n",
"timestamp": "22", "body": ""}
+redirect_request_header = {"headers": "GET /redirect HTTP/1.1\r\nHost:
*\r\n\r\n", "timestamp": "5678", "body": ""}
+redirect_response_header = {"headers": "HTTP/1.1 302 Found\r\nLocation:
http://127.0.0.1:{0}/redirectDest\r\n\r\n".format(
+ dest_serv.Variables.Port), "timestamp": "5678", "body": ""}
+dest_request_header = {"headers": "GET /redirectDest HTTP/1.1\r\nHost:
*\r\n\r\n", "timestamp": "11", "body": ""}
+dest_response_header = {"headers": "HTTP/1.1 204 No Content\r\n\r\n",
"timestamp": "22", "body": ""}
redirect_serv.addResponse("sessionfile.log", redirect_request_header,
redirect_response_header)
dest_serv.addResponse("sessionfile.log", dest_request_header,
dest_response_header)
ts.Disk.remap_config.AddLine(
- 'map http://127.0.0.1:{0}
http://127.0.0.1:{1}'.format(ts.Variables.port, redirect_serv.Variables.Port)
+ 'map http://127.0.0.1:{0} http://127.0.0.1:{1}'.format(ts.Variables.port,
redirect_serv.Variables.Port)
)
tr = Test.AddTestRun()
@@ -60,4 +61,3 @@ tr.Processes.Default.StartBefore(redirect_serv)
tr.Processes.Default.StartBefore(dest_serv)
tr.Processes.Default.Streams.stdout = "gold/redirect.gold"
tr.Processes.Default.ReturnCode = 0
-
diff --git a/tests/gold_tests/tls_hooks/tls_hooks12.test.py
b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
index 571538b..aff3bc3 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks12.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
@@ -74,13 +74,13 @@ ts.Streams.stderr =
"gold/ts-preaccept-delayed-1-immdate-2.gold"
# sequence may appear on that probe. Or it may not. If we move away from the
probe connection
# we can check for the right number of each message.
#preacceptstring0 = "Pre accept delay callback 0"
-#ts.Streams.All = Testers.ContainsExpression(
+# ts.Streams.All = Testers.ContainsExpression(
# "\A(?:(?!{0}).)*{0}.*({0})?(?!.*{0}).*\Z".format(preacceptstring0), "Pre
accept message appears only once or twice", reflags=re.S | re.M)
#preacceptstring1 = "Pre accept callback 0"
-#ts.Streams.All = Testers.ContainsExpression(
+# ts.Streams.All = Testers.ContainsExpression(
# "\A(?:(?!{0}).)*{0}.*({0})?(?!.*{0}).*\Z".format(preacceptstring1), "Pre
accept message appears only once or twice", reflags=re.S | re.M)
#preacceptstring2 = "Pre accept callback 1"
-#ts.Streams.All = Testers.ContainsExpression(
+# ts.Streams.All = Testers.ContainsExpression(
# "\A(?:(?!{0}).)*{0}.*({0})?(?!.*{0}).*\Z".format(preacceptstring2), "Pre
accept message appears only once or twice", reflags=re.S | re.M)
tr.Processes.Default.TimeOut = 5
diff --git a/tests/tools/tcp_408_client.py b/tests/tools/tcp_408_client.py
index eb1d721..de53697 100644
--- a/tests/tools/tcp_408_client.py
+++ b/tests/tools/tcp_408_client.py
@@ -22,6 +22,7 @@ import socket
import sys
import time
+
def tcp_client(host, port, sleep, header, data):
pass
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/tests/tools/traffic-replay/Config.py
b/tests/tools/traffic-replay/Config.py
index 1b97227..48d3fc3 100644
--- a/tests/tools/traffic-replay/Config.py
+++ b/tests/tools/traffic-replay/Config.py
@@ -30,5 +30,5 @@ proxy_nonssl_port = 8080
nProcess = 4
nThread = 4
-#colorize output
+# colorize output
colorize = True
diff --git a/tests/tools/traffic-replay/RandomReplay.py
b/tests/tools/traffic-replay/RandomReplay.py
index ef912f5..cf241d7 100644
--- a/tests/tools/traffic-replay/RandomReplay.py
+++ b/tests/tools/traffic-replay/RandomReplay.py
@@ -38,6 +38,7 @@ import itertools
import random
bSTOP = False
+
def session_replay(input, proxy, result_queue):
global bSTOP
''' Replay all transactions in session
@@ -55,13 +56,13 @@ def session_replay(input, proxy, result_queue):
with requests.Session() as request_session:
request_session.proxies = proxy
for txn in session.getTransactionIter():
- type = random.randint(1,1000)
+ type = random.randint(1, 1000)
try:
- if type%3 == 0:
+ if type % 3 == 0:
NonSSL.txn_replay(session._filename, txn, proxy,
result_queue, request_session)
- elif type%3 == 1:
+ elif type % 3 == 1:
SSLReplay.txn_replay(session._filename, txn,
proxy, result_queue, request_session)
- elif type%3 == 2:
+ elif type % 3 == 2:
h2Replay.txn_replay(session._filename, txn, proxy,
result_queue, request_session)
except:
e = sys.exc_info()
@@ -71,10 +72,11 @@ def session_replay(input, proxy, result_queue):
input.put('STOP')
break
+
def client_replay(input, proxy, result_queue, nThread):
Threads = []
for i in range(nThread):
-
+
t2 = Thread(target=SSLReplay.session_replay, args=[input, proxy,
result_queue])
t = Thread(target=NonSSL.session_replay, args=[input, proxy,
result_queue])
t1 = Thread(target=h2Replay.session_replay, args=[input, proxy,
result_queue])
@@ -85,6 +87,5 @@ def client_replay(input, proxy, result_queue, nThread):
Threads.append(t2)
Threads.append(t1)
-
for t1 in Threads:
t1.join()
diff --git a/tests/tools/traffic-replay/WorkerTask.py
b/tests/tools/traffic-replay/WorkerTask.py
index 45d4a87..839e696 100644
--- a/tests/tools/traffic-replay/WorkerTask.py
+++ b/tests/tools/traffic-replay/WorkerTask.py
@@ -43,7 +43,7 @@ def worker(input, output, proxy, replay_type, nThread):
h2Replay.client_replay(input, proxy, output, nThread)
elif replay_type == 'random':
RandomReplay.client_replay(input, proxy, output, nThread)
-
+
# progress_bar.next()
# progress_bar.finish()
print("process{0} has exited".format(current_process().name))
diff --git a/tests/tools/traffic-replay/__main__.py
b/tests/tools/traffic-replay/__main__.py
index c19900b..0f6074a 100644
--- a/tests/tools/traffic-replay/__main__.py
+++ b/tests/tools/traffic-replay/__main__.py
@@ -28,15 +28,16 @@ if __name__ == '__main__':
parser.add_argument("-type", action='store', dest='replay_type',
help="Replay type: ssl/random/h2/nossl")
parser.add_argument("-log_dir", type=str, help="directory of JSON replay
files")
parser.add_argument("-v", dest="verbose", help="verify response status
code", action="store_true")
- parser.add_argument("-host", help="proxy/host to send the requests
to",default=Config.proxy_host)
- parser.add_argument("-port",type=int,help=" The non secure port of ATS to
send the request to",default=Config.proxy_nonssl_port)
- parser.add_argument("-s_port",type=int,help="secure
port",default=Config.proxy_ssl_port)
- parser.add_argument("-ca_cert",help="Certificate to
present",default=Config.ca_certs)
- parser.add_argument("-colorize",type=str,help="specify whether to use
colorize the output",default='True')
+ parser.add_argument("-host", help="proxy/host to send the requests to",
default=Config.proxy_host)
+ parser.add_argument("-port", type=int, help=" The non secure port of ATS
to send the request to",
+ default=Config.proxy_nonssl_port)
+ parser.add_argument("-s_port", type=int, help="secure port",
default=Config.proxy_ssl_port)
+ parser.add_argument("-ca_cert", help="Certificate to present",
default=Config.ca_certs)
+ parser.add_argument("-colorize", type=str, help="specify whether to use
colorize the output", default='True')
args = parser.parse_args()
# Let 'er loose
#main(args.log_dir, args.hostname, int(args.port), args.threads,
args.timing, args.verbose)
Config.colorize = True if args.colorize == 'True' else False
- mainProcess.main(args.log_dir, args.replay_type, args.verbose, pHost =
args.host, pNSSLport = args.port, pSSL = args.s_port)
+ mainProcess.main(args.log_dir, args.replay_type, args.verbose,
pHost=args.host, pNSSLport=args.port, pSSL=args.s_port)
diff --git a/tests/tools/traffic-replay/mainProcess.py
b/tests/tools/traffic-replay/mainProcess.py
index 26a3513..bde8de4 100644
--- a/tests/tools/traffic-replay/mainProcess.py
+++ b/tests/tools/traffic-replay/mainProcess.py
@@ -65,7 +65,7 @@ def check_for_ats(hostname, port):
# Hopefully this isn't an issue because multi-line headers are deprecated now
-def main(path, replay_type, Bverbose, pHost = Config.proxy_host, pNSSLport =
Config.proxy_nonssl_port, pSSL = Config.proxy_ssl_port):
+def main(path, replay_type, Bverbose, pHost=Config.proxy_host,
pNSSLport=Config.proxy_nonssl_port, pSSL=Config.proxy_ssl_port):
global verbose
verbose = Bverbose
check_for_ats(pHost, pNSSLport)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].
