Skip to content

Enable conf_remap_float test and remove special case for local config file #8540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randall merged 1 commit into from
Dec 1, 2021
Merged

Enable conf_remap_float test and remove special case for local config file #8540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tests/gold_tests/autest-site/trafficserver.test.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,6 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True,
tmpname = os.path.join(config_dir, fname)
p.Disk.File(tmpname, id=make_id(fname), typename="ats:config")

# for conf_remap_float, used by conf_remap plugin
fname = "delain.config"
tmpname = os.path.join(config_dir, fname)
p.Disk.File(tmpname, id=make_id(fname), typename="ats:config")

fname = "hosting.config"
tmpname = os.path.join(config_dir, fname)
p.Disk.File(tmpname, id=make_id(fname), typename="ats:config")
Expand All @@ -259,7 +254,6 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True,
tmpname = os.path.join(config_dir, fname)
p.Disk.File(tmpname, id=make_id(fname), typename="ats:config")

# magic file that should probally not exist
fname = "logging.yaml"
tmpname = os.path.join(config_dir, fname)
p.Disk.File(tmpname, id=make_id(fname), typename="ats:config")
Expand Down
23 changes: 6 additions & 17 deletions tests/gold_tests/remap/conf_remap_float.py → ...gold_tests/remap/conf_remap_float.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'''
'''
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand All @@ -17,30 +15,21 @@
# limitations under the License.


import os

Test.Summary = '''
Test command: traffic_ctl config describe proxy.config.http.background_fill_completed_threshold (YTSATS-3309)
'''
Test.testName = 'Float in conf_remap Config Test'

ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)

# Add dummy remap rule
ts.Disk.remap_config.AddLine(
'map http://cdn.example.com/ http://origin.example.com/ @plugin=conf_remap.so @pparam={file}'.format(
file=os.path.join(ts.RunDirectory, 'ts/config/delain.config'))
)

ts.Disk.delain_config.AddLine(
ts.Disk.MakeConfigFile('conf_remap.config').AddLines([
'CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.500000'
)
])

#
# Test body
#
ts.Disk.remap_config.AddLine(
f"map http://cdn.example.com/ http://origin.example.com/ @plugin=conf_remap.so @pparam={Test.RunDirectory}/ts/config/conf_remap.config"
)

# First reload
tr = Test.AddTestRun("traffic_ctl command")
tr.Env = ts.Env
tr.TimeOut = 5
Expand All @@ -49,4 +38,4 @@
p = tr.Processes.Default
p.Command = "traffic_ctl config describe proxy.config.http.background_fill_completed_threshold"
p.ReturnCode = 0
p.StartBefore(Test.Processes.ts, ready=When.FileExists(os.path.join(tr.RunDirectory, 'ts/log/diags.log')))
p.StartBefore(Test.Processes.ts)