Fix tests on windows (#1303)

and disable junit, it produces a deprecation warning
This commit is contained in:
Alexander Kukushkin
2019-11-27 14:57:33 +01:00
committed by GitHub
parent 525a26fab5
commit 7793887ea7
3 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -1,6 +1,7 @@
import mock # for the mock.call method, importing it without a namespace breaks python3
import os
import psycopg2
import re
import subprocess
import time
@@ -220,7 +221,8 @@ class TestPostgresql(BaseTestPostgresql):
with patch('patroni.postgresql.config.ConfigHandler.primary_conninfo_params', Mock(return_value=conninfo)):
mock_get_pg_settings.return_value['recovery_min_apply_delay'][1] = '1'
self.assertEqual(self.p.config.check_recovery_conf(None), (True, True))
mock_get_pg_settings.return_value['primary_conninfo'][1] = 'host=1 passfile=' + self.p.config._pgpass
mock_get_pg_settings.return_value['primary_conninfo'][1] = 'host=1 passfile='\
+ re.sub(r'([\'\\ ])', r'\\\1', self.p.config._pgpass)
mock_get_pg_settings.return_value['recovery_min_apply_delay'][1] = '0'
self.assertEqual(self.p.config.check_recovery_conf(None), (True, True))
self.p.config.write_recovery_conf({'standby_mode': 'on', 'primary_conninfo': conninfo.copy()})