fix up deploy unzip

This commit is contained in:
Tim Bentley 2017-03-05 09:32:11 +00:00
parent 7a72b2cad4
commit 06baf5c560
2 changed files with 34 additions and 32 deletions

View File

@ -26,90 +26,92 @@ import shutil
from tempfile import mkdtemp from tempfile import mkdtemp
from unittest import TestCase from unittest import TestCase
from openlp.plugins.remotes.deploy import check_for_previous_deployment, deploy_zipfile from openlp.core.api.deploy import check_for_previous_deployment, deploy_zipfile
from tests.functional import patch from tests.functional import patch
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources')) TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources'))
class TestRemoteDeploy(TestCase): class TestRemoteDeploy(TestCase):
""" '''
Test the Remote plugin deploy functions Test the Remote plugin deploy functions
""" '''
def setUp(self): def setUp(self):
""" '''
Setup for tests Setup for tests
""" '''
self.app_root = mkdtemp() self.app_root = mkdtemp()
def tearDown(self): def tearDown(self):
""" '''
Clean up after tests Clean up after tests
""" '''
shutil.rmtree(self.app_root) shutil.rmtree(self.app_root)
@patch('openlp.plugins.remotes.deploy.os.path.isfile') @patch('openlp.core.api.deploy.os.path.isfile')
@patch('openlp.plugins.remotes.deploy.os.mknod') @patch('openlp.core.api.deploy.os.mknod')
def test_check_for_previous_deployment_false(self, mocked_mknod, mocked_isfile): def test_check_for_previous_deployment_false(self, mocked_mknod, mocked_isfile):
""" '''
Remote Deploy tests - Test when the marker file is missing Remote Deploy tests - Test when the marker file is missing
""" '''
# GIVEN: A new setup with no marker file # GIVEN: A new setup with no marker file
# WHEN: I check for a deployment which does not create the marker file # WHEN: I check for a deployment which does not create the marker file
mocked_isfile.return_value = False mocked_isfile.return_value = False
processed = check_for_previous_deployment(self.app_root) processed = check_for_previous_deployment(self.app_root)
# THEN test the see if marker has not been created # THEN test the see if marker has not been created
self.assertFalse(processed, "should return False as marker does not exist") self.assertFalse(processed, 'should return False as marker does not exist')
mocked_isfile.assert_called_once_with(os.path.join(self.app_root, "marker.txt")) mocked_isfile.assert_called_once_with(os.path.join(self.app_root, 'marker.txt'))
mocked_mknod.assert_not_called() mocked_mknod.assert_not_called()
@patch('openlp.plugins.remotes.deploy.os.path.isfile') @patch('openlp.core.api.deploy.os.path.isfile')
@patch('openlp.plugins.remotes.deploy.os.mknod') @patch('openlp.core.api.deploy.os.mknod')
def test_check_for_previous_deployment_true(self, mocked_mknod, mocked_isfile): def test_check_for_previous_deployment_true(self, mocked_mknod, mocked_isfile):
""" '''
Remote Deploy tests - Test when the marker file is missing Remote Deploy tests - Test when the marker file is missing
""" '''
# GIVEN: A new setup with not market file # GIVEN: A new setup with not market file
# WHEN: I check for a deployment which does create the marker file # WHEN: I check for a deployment which does create the marker file
mocked_isfile.return_value = False mocked_isfile.return_value = False
processed = check_for_previous_deployment(self.app_root, True) processed = check_for_previous_deployment(self.app_root, True)
# THEN test the see if marker has been created # THEN test the see if marker has been created
marker_file = os.path.join(self.app_root, "marker.txt") marker_file = os.path.join(self.app_root, 'marker.txt')
self.assertFalse(processed, "should return False as marker does not exist") self.assertFalse(processed, 'should return False as marker does not exist')
mocked_isfile.assert_called_once_with(marker_file) mocked_isfile.assert_called_once_with(marker_file)
mocked_mknod.assert_called_once_with(marker_file) mocked_mknod.assert_called_once_with(marker_file)
@patch('openlp.plugins.remotes.deploy.os.path.isfile') @patch('openlp.core.api.deploy.os.path.isfile')
@patch('openlp.plugins.remotes.deploy.os.mknod') @patch('openlp.core.api.deploy.os.mknod')
def test_check_for_previous_deployment_true(self, mocked_mknod, mocked_isfile): def test_check_for_previous_deployment_true(self, mocked_mknod, mocked_isfile):
""" '''
Remote Deploy tests - Test when the marker file is present Remote Deploy tests - Test when the marker file is present
""" '''
# GIVEN: A new setup with not market file # GIVEN: A new setup with not market file
# WHEN: I check for a deployment which does not create the marker file # WHEN: I check for a deployment which does not create the marker file
mocked_isfile.return_value = True mocked_isfile.return_value = True
processed = check_for_previous_deployment(self.app_root, True) processed = check_for_previous_deployment(self.app_root, True)
# THEN test the see if marker is present and has not been created # THEN test the see if marker is present and has not been created
marker_file = os.path.join(self.app_root, "marker.txt") marker_file = os.path.join(self.app_root, 'marker.txt')
self.assertTrue(processed, "should return True as marker does exist") self.assertTrue(processed, 'should return True as marker does exist')
mocked_isfile.assert_called_once_with(marker_file) mocked_isfile.assert_called_once_with(marker_file)
mocked_mknod.assert_not_called() mocked_mknod.assert_not_called()
@patch('openlp.plugins.remotes.deploy.open') @patch('openlp.core.api.deploy.open')
def test_deploy_zipfile(self, mocked_open): def test_deploy_zipfile(self, mocked_open):
""" '''
Remote Deploy tests - test the dummy zip file is processed correctly Remote Deploy tests - test the dummy zip file is processed correctly
""" '''
# GIVEN: A new downloaded zip file # GIVEN: A new downloaded zip file
zip_file = os.path.join(TEST_PATH, "remotes", "deploy.zip") zip_file = os.path.join(TEST_PATH, 'remotes', 'site.zip')
app_root = os.path.join(self.app_root, 'site.zip')
shutil.copyfile(zip_file, app_root)
# WHEN: I process the zipfile # WHEN: I process the zipfile
deploy_zipfile(zip_file, self.app_root) deploy_zipfile(self.app_root, 'site.zip')
# THEN test the see if marker is present and has not been created # THEN test the see if marker is present and has not been created
self.assertEqual(mocked_open.call_count, 46, "We should write 46 files") self.assertEqual(mocked_open.call_count, 46, 'We should write 46 files')