From d8049f331fee63776a816103055af32f736e98b9 Mon Sep 17 00:00:00 2001 From: Joao Gilberto Magalhaes Date: Mon, 18 Nov 2024 09:15:40 -0600 Subject: [PATCH] Fix com duplicated name in tests --- src/tests/test_daemonize.py | 6 +++--- src/tests/test_functions.py | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/tests/test_daemonize.py b/src/tests/test_daemonize.py index dad002f..f5a4a23 100644 --- a/src/tests/test_daemonize.py +++ b/src/tests/test_daemonize.py @@ -22,7 +22,7 @@ def test_daemonize_haproxy_get_haproxy_command_reload(): command = daemon.get_haproxy_command(DaemonizeHAProxy.HAPROXY_RELOAD) assert command == "/usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -x /var/run/haproxy.sock -sf " -def test_daemonize_haproxy_check_config(): +def test_daemonize_haproxy2_check_config(): daemon = DaemonizeHAProxy(os.path.abspath(os.path.dirname(__file__)) + '/fixtures') filed = daemon.get_custom_config_files() assert filed == { @@ -30,13 +30,13 @@ def test_daemonize_haproxy_check_config(): os.path.dirname(__file__) + "/fixtures/10_haproxy.cfg": os.path.getmtime(os.path.dirname(__file__) + "/fixtures/10_haproxy.cfg") } -def test_daemonize_haproxy_get_haproxy_command_start(): +def test_daemonize_haproxy2_get_haproxy_command_start(): daemon = DaemonizeHAProxy(os.path.abspath(os.path.dirname(__file__)) + '/fixtures') command = daemon.get_haproxy_command(DaemonizeHAProxy.HAPROXY_START) assert command == "/usr/sbin/haproxy -W -f /etc/haproxy/haproxy.cfg -f %s -p /run/haproxy.pid -S /var/run/haproxy.sock" % (os.path.dirname(__file__) + "/fixtures") -def test_daemonize_haproxy_get_haproxy_command_reload(): +def test_daemonize_haproxy2_get_haproxy_command_reload(): tmp_pid_file = "/tmp/tmp_pid.txt" Functions.save(tmp_pid_file, "10") diff --git a/src/tests/test_functions.py b/src/tests/test_functions.py index 0ab4c00..1189d20 100644 --- a/src/tests/test_functions.py +++ b/src/tests/test_functions.py @@ -87,7 +87,9 @@ def test_functions_run_bash_return(): def test_functions_run_bash_log_and_return_output(): print() try: - return_code, result = Functions.run_bash(loggerDebug, "echo 'test run 4'", log_output=True, return_result=True) + return_code, result = Functions.run_bash(loggerDebug, "echo 'test run 4'", + log_output=True, + return_result=True) assert return_code == 0 assert "".join(result) == 'test run 4' log_value = log_stream.getvalue().strip("\x00") @@ -100,7 +102,8 @@ def test_functions_run_bash_log_and_return_output(): def test_functions_run_bash_ok(): print() try: - return_code, result = Functions.run_bash(loggerDebug, "%s/fixtures/run_bash.sh" % os.path.dirname(__file__), log_output=True, + return_code, result = Functions.run_bash(loggerDebug, "%s/fixtures/run_bash.sh" % os.path.dirname(__file__), + log_output=True, return_result=False) assert return_code == 0 assert result == [] @@ -114,7 +117,8 @@ def test_functions_run_bash_ok(): def test_functions_run_bash_fail(): print() try: - return_code, result = Functions.run_bash(loggerDebug, "%s/fixtures/run_bash.sh 15" % os.path.dirname(__file__), log_output=True, + return_code, result = Functions.run_bash(loggerDebug, "%s/fixtures/run_bash.sh 15" % os.path.dirname(__file__), + log_output=True, return_result=False) assert return_code == 15 assert result == [] @@ -128,7 +132,8 @@ def test_functions_run_bash_fail(): def test_functions_run_command_not_found(): print() try: - return_code, result = Functions.run_bash(loggerDebug, "no_command_here", log_output=True, + return_code, result = Functions.run_bash(loggerDebug, "no_command_here", + log_output=True, return_result=False) assert return_code == -99 assert str(result) == "[Errno 2] No such file or directory: 'no_command_here'"