Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion tests/gold_tests/logging/ts_process_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ def __init__(self, message):
def get_ts_process_pid(ts_identifier):
processes = []
for proc in psutil.process_iter(['cmdline']):
commandline = ' '.join(proc.info['cmdline'])
cmdline = proc.info.get('cmdline', [])
if not cmdline:
continue
commandline = ' '.join(cmdline)
if '/traffic_server' in commandline and ts_identifier in commandline:
return proc
raise GetPidError("Could not find a traffic_server process")
Expand Down
3 changes: 2 additions & 1 deletion tests/gold_tests/redirect/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
generated_test_data/
redirect_actions_generated_test_data/
redirect_generated_test_data/
2 changes: 1 addition & 1 deletion tests/gold_tests/redirect/redirect.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

dns.addRecords(records={"iwillredirect.test": ["127.0.0.1"]})

data_dirname = 'generated_test_data'
data_dirname = 'redirect_generated_test_data'
data_path = os.path.join(Test.TestDirectory, data_dirname)
os.makedirs(data_path, exist_ok=True)

Expand Down
2 changes: 1 addition & 1 deletion tests/gold_tests/redirect/redirect_actions.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
# Map scenarios to trafficserver processes.
trafficservers = {}

data_dirname = 'generated_test_data'
data_dirname = 'redirect_actions_generated_test_data'
data_path = os.path.join(Test.TestDirectory, data_dirname)
os.makedirs(data_path, exist_ok=True)

Expand Down