raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix an incorrect if and update tests

Browse Source
This commit is contained in:
Raoul Snyman 2019-07-02 23:30:01 -07:00
parent 11ad9dbb22
commit a8e46110ed
2 changed files with 48 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/__init__.py
View File

@ -65,7 +65,7 @@ def get_network_interfaces():
interfaces = {} interfaces = {}
for interface in QNetworkInterface.allInterfaces(): for interface in QNetworkInterface.allInterfaces():
interface_name = interface.name() interface_name = interface.name()
if not INTERFACE_FILTER.search(interface_name): if INTERFACE_FILTER.search(interface_name):
log.debug('Filtering out interfaces we don\'t care about: {name}'.format(name=interface_name)) log.debug('Filtering out interfaces we don\'t care about: {name}'.format(name=interface_name))
continue continue
log.debug('Checking for isValid and flags == IsUP | IsRunning') log.debug('Checking for isValid and flags == IsUP | IsRunning')

109
tests/openlp_core/common/test_network_interfaces.py
View File

@ -101,7 +101,7 @@ class TestInterfaces(TestCase, TestMixin):
self.destroy_settings() self.destroy_settings()
@patch.object(openlp.core.common, 'log') @patch.object(openlp.core.common, 'log')
def test_ip4_no_interfaces(self, mock_log): def test_network_interfaces_no_interfaces(self, mock_log):
""" """
Test no interfaces available Test no interfaces available
""" """
@ -109,7 +109,7 @@ class TestInterfaces(TestCase, TestMixin):
call_debug = [call('Getting local IPv4 interface(es) information')] call_debug = [call('Getting local IPv4 interface(es) information')]
call_warning = [call('No active IPv4 network interfaces detected')] call_warning = [call('No active IPv4 network interfaces detected')]
# WHEN: get_local_ip4 is called # WHEN: get_network_interfaces() is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface: with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [] mock_network_interface.allInterfaces.return_value = []
interfaces = get_network_interfaces() interfaces = get_network_interfaces()
@ -120,33 +120,49 @@ class TestInterfaces(TestCase, TestMixin):
assert not interfaces, 'There should have been no active interfaces listed' assert not interfaces, 'There should have been no active interfaces listed'
@patch.object(openlp.core.common, 'log') @patch.object(openlp.core.common, 'log')
def test_ip4_lo(self, mock_log): def test_network_interfaces_lo(self, mock_log):
""" """
Test get_local_ip4 returns proper dictionary with 'lo' Test get_network_interfaces() returns an empty dictionary if "lo" is the only network interface
""" """
# GIVEN: Test environment # GIVEN: Test environment
call_debug = [call('Getting local IPv4 interface(es) information'), call_debug = [
call('Checking for isValid and flags == IsUP | IsRunning'), call('Getting local IPv4 interface(es) information'),
call('Checking address(es) protocol'), call("Filtering out interfaces we don't care about: lo")
call('Checking for protocol == IPv4Protocol'), ]
call('Getting interface information'),
call('Adding lo to active list')]
call_warning = [call('No active IPv4 interfaces found except localhost')]
# WHEN: get_local_ip4 is called # WHEN: get_network_interfaces() is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface: with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [self.fake_lo] mock_network_interface.allInterfaces.return_value = [self.fake_lo]
interfaces = get_network_interfaces() interfaces = get_network_interfaces()
# THEN: There should be a fake 'lo' interface # THEN: There should be no interfaces
mock_log.debug.assert_has_calls(call_debug) mock_log.debug.assert_has_calls(call_debug)
mock_log.warning.assert_has_calls(call_warning) assert interfaces == {}, 'There should be no interfaces listed'
assert interfaces == self.fake_lo.fake_data, "There should have been an 'lo' interface listed"
@patch.object(openlp.core.common, 'log') @patch.object(openlp.core.common, 'log')
def test_ip4_localhost(self, mock_log): def test_network_interfaces_localhost(self, mock_log):
""" """
Test get_local_ip4 returns proper dictionary with 'lo' if interface is 'localhost' Test get_network_interfaces() returns an empty dictionary if "localhost" is the only network interface
"""
# GIVEN: Test environment
call_debug = [
call('Getting local IPv4 interface(es) information'),
call("Filtering out interfaces we don't care about: localhost")
]
# WHEN: get_network_interfaces() is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [self.fake_localhost]
interfaces = get_network_interfaces()
# THEN: There should be no interfaces
mock_log.debug.assert_has_calls(call_debug)
assert interfaces == {}, 'There should be no interfaces listed'
@patch.object(openlp.core.common, 'log')
def test_network_interfaces_eth25(self, mock_log):
"""
Test get_network_interfaces() returns proper dictionary with 'eth25'
""" """
# GIVEN: Test environment # GIVEN: Test environment
call_debug = [ call_debug = [
@ -155,70 +171,39 @@ class TestInterfaces(TestCase, TestMixin):
call('Checking address(es) protocol'), call('Checking address(es) protocol'),
call('Checking for protocol == IPv4Protocol'), call('Checking for protocol == IPv4Protocol'),
call('Getting interface information'), call('Getting interface information'),
call('Adding localhost to active list') call('Adding eth25 to active list')
] ]
call_warning = [call('No active IPv4 interfaces found except localhost')]
# WHEN: get_local_ip4 is called # WHEN: get_network_interfaces() is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [self.fake_localhost]
interfaces = get_network_interfaces()
# THEN: There should be a fake 'lo' interface
mock_log.debug.assert_has_calls(call_debug)
mock_log.warning.assert_has_calls(call_warning)
assert interfaces == self.fake_lo.fake_data, "There should have been an 'lo' interface listed"
@patch.object(openlp.core.common, 'log')
def test_ip4_eth25(self, mock_log):
"""
Test get_local_ip4 returns proper dictionary with 'eth25'
"""
# GIVEN: Test environment
call_debug = [call('Getting local IPv4 interface(es) information'),
call('Checking for isValid and flags == IsUP | IsRunning'),
call('Checking address(es) protocol'),
call('Checking for protocol == IPv4Protocol'),
call('Getting interface information'),
call('Adding eth25 to active list')]
call_warning = []
# WHEN: get_local_ip4 is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface: with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [self.fake_address] mock_network_interface.allInterfaces.return_value = [self.fake_address]
interfaces = get_network_interfaces() interfaces = get_network_interfaces()
# THEN: There should be a fake 'eth25' interface # THEN: There should be a fake 'eth25' interface
mock_log.debug.assert_has_calls(call_debug) mock_log.debug.assert_has_calls(call_debug)
mock_log.warning.assert_has_calls(call_warning)
assert interfaces == self.fake_address.fake_data assert interfaces == self.fake_address.fake_data
@patch.object(openlp.core.common, 'log') @patch.object(openlp.core.common, 'log')
def test_ip4_lo_eth25(self, mock_log): def test_network_interfaces_lo_eth25(self, mock_log):
""" """
Test get_local_ip4 returns proper dictionary with 'eth25' Test get_network_interfaces() returns proper dictionary with 'eth25'
""" """
# GIVEN: Test environment # GIVEN: Test environment
call_debug = [call('Getting local IPv4 interface(es) information'), call_debug = [
call('Checking for isValid and flags == IsUP | IsRunning'), call('Getting local IPv4 interface(es) information'),
call('Checking address(es) protocol'), call("Filtering out interfaces we don't care about: lo"),
call('Checking for protocol == IPv4Protocol'), call('Checking for isValid and flags == IsUP | IsRunning'),
call('Getting interface information'), call('Checking address(es) protocol'),
call('Adding lo to active list'), call('Checking for protocol == IPv4Protocol'),
call('Checking for isValid and flags == IsUP | IsRunning'), call('Getting interface information'),
call('Checking address(es) protocol'), call('Adding eth25 to active list')
call('Checking for protocol == IPv4Protocol'), ]
call('Getting interface information'),
call('Adding eth25 to active list'),
call('Found at least one IPv4 interface, removing localhost')]
call_warning = []
# WHEN: get_local_ip4 is called # WHEN: get_network_interfaces() is called
with patch('openlp.core.common.QNetworkInterface') as mock_network_interface: with patch('openlp.core.common.QNetworkInterface') as mock_network_interface:
mock_network_interface.allInterfaces.return_value = [self.fake_lo, self.fake_address] mock_network_interface.allInterfaces.return_value = [self.fake_lo, self.fake_address]
interfaces = get_network_interfaces() interfaces = get_network_interfaces()
# THEN: There should be a fake 'eth25' interface # THEN: There should be a fake 'eth25' interface
mock_log.debug.assert_has_calls(call_debug) mock_log.debug.assert_has_calls(call_debug)
mock_log.warning.assert_has_calls(call_warning)
assert interfaces == self.fake_address.fake_data, "There should have been only 'eth25' interface listed" assert interfaces == self.fake_address.fake_data, "There should have been only 'eth25' interface listed"