##// END OF EJS Templates
tests: fixed some tests because of wrong compare strings
super-admin -
r5097:ff28a588 default
parent child Browse files
Show More
@@ -137,7 +137,7 b' def test_get_config(user_util, baseapp, '
137 ('phases', 'publish', 'True'),
137 ('phases', 'publish', 'True'),
138 ('extensions', 'largefiles', ''),
138 ('extensions', 'largefiles', ''),
139 ('paths', '/', hg_config_org.get('paths', '/')),
139 ('paths', '/', hg_config_org.get('paths', '/')),
140 ('rhodecode', 'RC_SCM_DATA', '[["foo", "FOO", "bar", "BAR"]]')
140 ('rhodecode', 'RC_SCM_DATA', '[["foo","FOO","bar","BAR"]]')
141 ]
141 ]
142 for entry in expected_config:
142 for entry in expected_config:
143 assert entry in hg_config
143 assert entry in hg_config
@@ -153,7 +153,8 b' class TestHooksHttpHandler(object):'
153 with date_patcher, caplog.at_level(logging.DEBUG):
153 with date_patcher, caplog.at_level(logging.DEBUG):
154 handler.log_message('Some message %d, %s', 123, 'string')
154 handler.log_message('Some message %d, %s', 123, 'string')
155
155
156 expected_message = f"HOOKS: {ip_port} - - [{fake_date}] Some message 123, string"
156 expected_message = f"HOOKS: client={ip_port} - - [{fake_date}] Some message 123, string"
157
157 assert_message_in_log(
158 assert_message_in_log(
158 caplog.records, expected_message,
159 caplog.records, expected_message,
159 levelno=logging.DEBUG, module='hooks_daemon')
160 levelno=logging.DEBUG, module='hooks_daemon')
@@ -265,7 +266,7 b' class TestHttpHooksCallbackDaemon(object'
265
266
266 assert_message_in_log(
267 assert_message_in_log(
267 caplog.records,
268 caplog.records,
268 'Running event loop of callback daemon in background thread',
269 'Running thread-based loop of callback daemon in background',
269 levelno=logging.DEBUG, module='hooks_daemon')
270 levelno=logging.DEBUG, module='hooks_daemon')
270
271
271 def test_stop_cleans_up_the_connection(self, tcp_server, caplog):
272 def test_stop_cleans_up_the_connection(self, tcp_server, caplog):
General Comments 0
You need to be logged in to leave comments. Login now