fix tests

This commit is contained in:
ziirish 2019-03-06 17:27:50 +01:00
parent cc7771818c
commit 30223d5e52
No known key found for this signature in database
GPG key ID: 72DB229A64B54E46
6 changed files with 26 additions and 26 deletions

View file

@ -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')

View file

@ -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()