From 30223d5e52dcb09761cd36943e662a50cd67d07d Mon Sep 17 00:00:00 2001 From: ziirish Date: Wed, 6 Mar 2019 17:27:50 +0100 Subject: [PATCH] fix tests --- burpui/forms.py | 4 ++-- burpui/misc/backend/burp1.py | 4 ++-- burpui/misc/backend/parallel.py | 4 ++-- burpui/misc/backend/utils/burp2.py | 4 ++-- tests/legacy/test_burpui.py | 28 ++++++++++++++-------------- tests/unit/test_parser.py | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/burpui/forms.py b/burpui/forms.py index 9fcddba3..80fe2c45 100644 --- a/burpui/forms.py +++ b/burpui/forms.py @@ -15,7 +15,7 @@ from wtforms import StringField, PasswordField, BooleanField, SelectField, valid class LoginForm(FlaskForm): - username = StringField(__('Username'), [validators.Required()]) - password = PasswordField(__('Password'), [validators.Required()]) + username = StringField(__('Username'), [validators.DataRequired()]) + password = PasswordField(__('Password'), [validators.DataRequired()]) language = SelectField(__('Language'), choices=LANGUAGES.items(), default=get_locale) remember = BooleanField(__('Remember me'), [validators.Optional()]) diff --git a/burpui/misc/backend/burp1.py b/burpui/misc/backend/burp1.py index 45f9398f..35537acd 100644 --- a/burpui/misc/backend/burp1.py +++ b/burpui/misc/backend/burp1.py @@ -109,8 +109,8 @@ class Burp(BUIbackend): """ if dummy: return - self.client_version = None - self.server_version = None + self.client_version = '' + self.server_version = '' BUIbackend.__init__(self, server, conf) diff --git a/burpui/misc/backend/parallel.py b/burpui/misc/backend/parallel.py index aefaed41..8a2c1013 100644 --- a/burpui/misc/backend/parallel.py +++ b/burpui/misc/backend/parallel.py @@ -230,12 +230,12 @@ class Burp(Burp2): def get_client_version(self, agent=None): if self._client_version is None: self._client_version = trio.run(self._async_request, 'client_version') - return self._client_version + return self._client_version or '' def get_server_version(self, agent=None): if self._server_version is None: self._server_version = trio.run(self._async_request, 'server_version') - return self._server_version + return self._server_version or '' async def _async_status(self, query='c:\n', timeout=None, cache=True, agent=None): async_client = Parallel(self.conf) diff --git a/burpui/misc/backend/utils/burp2.py b/burpui/misc/backend/utils/burp2.py index a2040d72..ed1e43cc 100644 --- a/burpui/misc/backend/utils/burp2.py +++ b/burpui/misc/backend/utils/burp2.py @@ -124,13 +124,13 @@ class Monitor(object): @property def client_version(self): - return self._client_version + return self._client_version or '' @property def server_version(self): if self._server_version is None: self.status() - return self._server_version + return self._server_version or '' def _exit(self): """try not to leave child process server side""" diff --git a/tests/legacy/test_burpui.py b/tests/legacy/test_burpui.py index 3f5b0e8a..298f73a4 100644 --- a/tests/legacy/test_burpui.py +++ b/tests/legacy/test_burpui.py @@ -118,7 +118,7 @@ class BurpuiAPITestCase(TestCase): def test_no_clients(self): response = self.client.get(url_for('api.clients_stats')) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) def test_server_config_parsing(self): @@ -149,7 +149,7 @@ class BurpuiAPITestCase(TestCase): (u'suggest', self.bui.client.get_parser_attr('values')), (u'placeholders', self.bui.client.get_parser_attr('placeholders')), (u'defaults', self.bui.client.get_parser_attr('defaults')))) - self.assertEquals(response.json, asse) + self.assertEqual(response.json, asse) def test_client_config_parsing(self): rv = self.login('admin', 'admin') @@ -177,7 +177,7 @@ class BurpuiAPITestCase(TestCase): (u'suggest', self.bui.client.get_parser_attr('values')), (u'placeholders', self.bui.client.get_parser_attr('placeholders')), (u'defaults', self.bui.client.get_parser_attr('defaults')))) - self.assertEquals(response.json, asse) + self.assertEqual(response.json, asse) def test_restore(self): response = self.client.post(url_for('api.restore', name='dummy', backup=1), data=dict(strip=False)) @@ -185,7 +185,7 @@ class BurpuiAPITestCase(TestCase): def test_running_clients(self): response = self.client.get(url_for('api.running_clients')) - self.assertEquals(response.json, []) + self.assertEqual(response.json, []) def test_live_rendering(self): response = self.client.get(url_for('api.counters', client='toto')) @@ -195,37 +195,37 @@ class BurpuiAPITestCase(TestCase): def test_servers_json(self): response = self.client.get(url_for('api.servers_stats')) - self.assertEquals(response.json, []) + self.assertEqual(response.json, []) def test_live(self): response = self.client.get(url_for('api.live')) - self.assertEquals(response.json, []) + self.assertEqual(response.json, []) def test_running(self): response = self.client.get(url_for('api.running_backup')) - self.assertEquals(response.json, dict(running=False)) + self.assertEqual(response.json, dict(running=False)) def test_client_tree(self): response = self.client.get(url_for('api.client_tree', name='toto', backup=1)) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) def test_clients_report_json(self): response = self.client.get(url_for('api.clients_report')) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) def test_client_stat_json(self): response = self.client.get(url_for('api.client_stats', name='toto')) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) response = self.client.get(url_for('api.client_stats', name='toto', backup=1)) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) def test_client_json(self): response = self.client.get(url_for('api.client_report', name='toto')) - self.assertEquals(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') + self.assertEqual(json.loads(response.data.decode('utf-8'))['message'], u'Cannot contact burp server at 127.0.0.1:9999') self.assert500(response) @@ -536,12 +536,12 @@ class BurpuiRedisTestCase(TestCase): # def test_server_config_parsing(self): # rv = self.login('toto', 'toto') # response = self.client.get(url_for('api.server_settings', server='dummy')) -# self.assertEquals(response.json, {u'message': u'Sorry, you don\'t have rights to access the setting panel'}) +# self.assertEqual(response.json, {u'message': u'Sorry, you don\'t have rights to access the setting panel'}) # # def test_client_config_parsing(self): # rv = self.login('toto', 'toto') # response = self.client.get(url_for('api.client_settings', client='toto', server='dummy')) -# self.assertEquals(response.json, {u'message': u'Sorry, you don\'t have rights to access the setting panel'}) +# self.assertEqual(response.json, {u'message': u'Sorry, you don\'t have rights to access the setting panel'}) # # def test_restore(self): # rv = self.login('toto', 'toto') diff --git a/tests/unit/test_parser.py b/tests/unit/test_parser.py index d709a7cd..0933dab2 100644 --- a/tests/unit/test_parser.py +++ b/tests/unit/test_parser.py @@ -1,7 +1,7 @@ import os import tempfile -from burpui.misc.parser.utils import OptionMulti, OptionPair +from burpui.misc.parser.utils import OptionMulti, OptionInt def test_confsrv(parser): confsrv = parser.server_conf @@ -14,9 +14,9 @@ def test_confsrv(parser): assert keep == [3, 2] assert isinstance(keep_raw, OptionMulti) assert keep_raw.dump() == 'keep := 3\nkeep = 2' - assert port == [4971] - assert isinstance(port_raw, OptionPair) - assert port_raw.dump() == 'port = 4971\nmax_children = 5' + assert port == 4971 + assert isinstance(port_raw, OptionInt) + # assert port_raw.dump() == 'port = 4971\nmax_children = 5' def test_save_conf(parser): (tmp, tmp_dest) = tempfile.mkstemp()