From 4c098100ca1aa9570682d2bc214abff49a242052 Mon Sep 17 00:00:00 2001 From: Charles Langlois Date: Tue, 17 Dec 2024 12:03:04 -0500 Subject: [PATCH] wizard.service: Changed NAMESERVER_REGEX to support tabs as separator --- wazo_confd/plugins/wizard/service.py | 2 +- .../plugins/wizard/tests/test_service.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/wazo_confd/plugins/wizard/service.py b/wazo_confd/plugins/wizard/service.py index 787eba3b1..4df44094a 100644 --- a/wazo_confd/plugins/wizard/service.py +++ b/wazo_confd/plugins/wizard/service.py @@ -18,7 +18,7 @@ from .validator import build_validator USERNAME_VALUES = '2346789bcdfghjkmnpqrtvwxyzBCDFGHJKLMNPQRTVWXYZ' -NAMESERVER_REGEX = r'^nameserver (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' +NAMESERVER_REGEX = r'^nameserver\s(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' DEFAULT_ROOT_POLICY = 'wazo_default_master_user_policy' ASTERISK_AUTOPROV_CONFIG_FILENAME = '/etc/asterisk/pjsip.d/05-autoprov-wizard.conf' ASTERISK_AUTOPROV_CONFIG_TPL = '''\ diff --git a/wazo_confd/plugins/wizard/tests/test_service.py b/wazo_confd/plugins/wizard/tests/test_service.py index 3821d8d0d..3c6802053 100644 --- a/wazo_confd/plugins/wizard/tests/test_service.py +++ b/wazo_confd/plugins/wizard/tests/test_service.py @@ -117,6 +117,24 @@ def test_get_nameservers(self): mopen.assert_called_once_with('/etc/resolv.conf', 'r') assert_that(result, equal_to(expected_result)) + def test_get_nameservers_with_tabs(self): + resolv_conf = dedent( + ''' + search\texample.com + nameserver\t192.168.2.0 + nameserver\t192.168.2.1''' + ) + expected_result = ['192.168.2.0', '192.168.2.1'] + with patch( + 'wazo_confd.plugins.wizard.service.open', + mock_open(read_data=resolv_conf), + create=True, + ) as mopen: + result = self.service.get_nameservers() + + mopen.assert_called_once_with('/etc/resolv.conf', 'r') + assert_that(result, equal_to(expected_result)) + @patch('wazo_confd.plugins.wizard.service.open', create=True) def test_get_nameservers_return_none_if_no_file(self, mopen): mopen.side_effect = IOError()