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

Fix tests again

Browse Source
This commit is contained in:
Tim Bentley 2016-12-21 09:47:33 +00:00
parent 8570fb5e8c
commit a69df60978
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/functional/openlp_core_common/test_httputils.py
View File

@ -22,19 +22,29 @@
"""
Functional tests to test the AppLocation class and related methods.
"""
import socket
import os
import tempfile
import socket
from unittest import TestCase
from openlp.core.common.httputils import get_user_agent, get_web_page, get_url_file_size, url_get_file
from tests.functional import MagicMock, patch
from tests.helpers.testmixin import TestMixin
class TestHttpUtils(TestCase):
class TestHttpUtils(TestCase, TestMixin):
"""
A test suite to test out various methods around the AppLocation class.
A test suite to test out various http helper functions.
"""
def setUp(self):
self.tempfile = os.path.join(tempfile.gettempdir(), 'testfile')
def tearDown(self):
if os.path.isfile(self.tempfile):
os.remove(self.tempfile)
def test_get_user_agent_linux(self):
"""
Test that getting a user agent on Linux returns a user agent suitable for Linux
@ -257,7 +267,7 @@ class TestHttpUtils(TestCase):
mocked_urlopen.side_effect = socket.timeout()
# WHEN: Attempt to retrieve a file
url_get_file(url='http://localhost/test', f_path=self.tempfile)
url_get_file(MagicMock(), url='http://localhost/test', f_path=self.tempfile)
# THEN: socket.timeout should have been caught
# NOTE: Test is if $tmpdir/tempfile is still there, then test fails since ftw deletes bad downloaded files

3
tests/functional/openlp_core_ui/test_firsttimeform.py
View File

@ -224,7 +224,8 @@ class TestFirstTimeForm(TestCase, TestMixin):
# GIVEN: Initial setup and mocks
first_time_form = FirstTimeForm(None)
first_time_form.initialize(MagicMock())
mocked_get_web_page.side_effect = urllib.error.HTTPError(url='http//localhost',
mocked_get_web_page.side_effect = urllib.error.HTTPError(MagicMock(),
url='http//localhost',
code=407,
msg='Network proxy error',
hdrs=None,