Commit 7f76a406 authored by Vojtech Sodoma's avatar Vojtech Sodoma

2939 Use plain value in test expected results

parent 357c4add
......@@ -631,12 +631,12 @@ class TestAsteriskConfDAO(DAOTestCase, PickupHelperMixin):
def test_find_exten_group(self):
mds = self.add_mediaserver(name='mds1', display_name='MDS1', voip_ip='10.10.0.1')
group = self.add_groupfeatures(name='group_1', mediaserverid=mds.id)
queue = self.add_queue(name='group_1', commented=0)
self.add_queue(name='group_1', commented=0)
extension_row = self.add_extension(exten='12', context='default', type='group', typeval=str(group.id))
expected_result = [
{'exten': u'12',
'commented': queue.commented,
'commented': 0,
'context': u'default',
'typeval': str(group.id),
'type': 'group',
......@@ -661,11 +661,11 @@ class TestAsteriskConfDAO(DAOTestCase, PickupHelperMixin):
def test_find_exten_queue_on_default_mds(self):
extension = self.add_extension(exten='3000', context='default', type='queue', typeval='2')
self.add_queuefeatures(id=2, name='queue_1')
queue = self.add_queue(name='queue_1', commented=0)
self.add_queue(name='queue_1', commented=0)
expected_result = [
{'exten': u'3000',
'commented': queue.commented,
'commented': 0,
'context': u'default',
'typeval': '2',
'type': 'queue',
......@@ -687,13 +687,13 @@ class TestAsteriskConfDAO(DAOTestCase, PickupHelperMixin):
assert_that(result, contains())
def test_find_exten_meetme_on_default_mds(self):
staticmeetme = self.add_meetme_general_settings(id=7, category='rooms', commented=0)
self.add_meetme_general_settings(id=7, category='rooms', commented=0)
self.add_meetmefeatures(id=2, meetmeid=7)
extension = self.add_extension(exten='5000', context='default', type='meetme', typeval='2')
expected_result = [
{'exten': u'5000',
'commented': staticmeetme.commented,
'commented': 0,
'context': u'default',
'typeval': '2',
'type': 'meetme',
......@@ -715,12 +715,12 @@ class TestAsteriskConfDAO(DAOTestCase, PickupHelperMixin):
assert_that(result, contains())
def test_find_exten_incall_on_default_mds(self):
incall = self.add_incall(id=2, commented=0)
self.add_incall(id=2, commented=0)
extension = self.add_extension(exten='_0123X.', context='default', type='incall', typeval='2')
expected_result = [
{'exten': u'_0123X.',
'commented': incall.commented,
'commented': 0,
'context': u'default',
'typeval': '2',
'type': 'incall',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment