From 1327d636f23a726cd59b61a92fb53562662a7dcc Mon Sep 17 00:00:00 2001 From: Omri Zeneva Date: Tue, 7 Jun 2022 05:55:24 -0400 Subject: [PATCH] test: fix jaeger-agent unit test after changed default agent port, fix for the relevant unit test Signed-off-by: Omri Zeneva --- src/cephadm/cephadm | 5 +++-- src/cephadm/tests/test_cephadm.py | 2 +- src/pybind/mgr/cephadm/tests/test_services.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 9a20dea240a..215ffae5c0a 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1131,8 +1131,9 @@ class Tracing(object): if daemon_type == 'jaeger-agent': assert 'collector_nodes' in config Tracing.components[daemon_type]['daemon_args'] = [ - f'--reporter.grpc.host-port={config["collector_nodes"]} \ - --processor.jaeger-compact.server-host-port=6799'] + f'--reporter.grpc.host-port={config["collector_nodes"]}', + '--processor.jaeger-compact.server-host-port=6799' + ] ################################## diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py index 98b40e389b6..95de7facdd5 100644 --- a/src/cephadm/tests/test_cephadm.py +++ b/src/cephadm/tests/test_cephadm.py @@ -2434,4 +2434,4 @@ class TestJaeger: ) with open(f'/var/lib/ceph/{fsid}/jaeger-agent.daemon_id/unit.run', 'r') as f: run_cmd = f.readlines()[-1].rstrip() - assert run_cmd.endswith('quay.io/jaegertracing/jaeger-agent:1.29 --reporter.grpc.host-port=test:14250') + assert run_cmd.endswith('quay.io/jaegertracing/jaeger-agent:1.29 --reporter.grpc.host-port=test:14250 --processor.jaeger-compact.server-host-port=6799') diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 128dae12331..feb67dc2ff7 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -1126,9 +1126,9 @@ class TestJaeger: [ '--name', 'jaeger-agent.test', '--meta-json', - '{"service_name": "jaeger-agent", "ports": [6831], "ip": null, "deployed_by": [], "rank": null, "rank_generation": null, "extra_container_args": null}', + '{"service_name": "jaeger-agent", "ports": [6799], "ip": null, "deployed_by": [], "rank": null, "rank_generation": null, "extra_container_args": null}', '--config-json', '-', - '--tcp-ports', '6831' + '--tcp-ports', '6799' ], stdin=json.dumps(agent_config), -- 2.39.5