diff --git a/bin/prepare_test_environment.sh b/bin/prepare_test_environment.sh index 24c537ec..19c3800a 100644 --- a/bin/prepare_test_environment.sh +++ b/bin/prepare_test_environment.sh @@ -6,6 +6,7 @@ set -euo pipefail START_SERVER=false +OSE_LOGO_URL='https://github.com/Screenly/screenly-ose/raw/master/static/img/ose-logo.png' print_usage () { echo "Usage: $0 [-s]" @@ -34,7 +35,7 @@ done mkdir -p ~/.screenly ~/screenly_assets /tmp/USB/cleanup_folder cp ansible/roles/screenly/files/screenly.db ~/.screenly/ cp ansible/roles/screenly/files/screenly.conf ~/.screenly/ -curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png +curl $OSE_LOGO_URL > /tmp/image.png cp /tmp/image.png /tmp/USB/image.png cp /tmp/image.png /tmp/USB/cleanup_folder/image.png cp tests/config/ffserver.conf /etc/ffserver.conf diff --git a/tests/celery_tasks_test.py b/tests/celery_tasks_test.py index 029bf7f7..3196b93b 100644 --- a/tests/celery_tasks_test.py +++ b/tests/celery_tasks_test.py @@ -16,28 +16,13 @@ from settings import settings class CeleryTasksTestCase(unittest.TestCase): def setUp(self): - self.image_url = 'https://www.screenly.io/upload/ose-logo.png' + self.image_url = 'https://github.com/Screenly/screenly-ose/raw/master/static/img/ose-logo.png' celeryapp.conf.update(CELERY_ALWAYS_EAGER=True, CELERY_RESULT_BACKEND='', CELERY_BROKER_URL='') def download_image(self, image_url, image_path): system('curl {} > {}'.format(image_url, image_path)) -class TestUpgradeScreenly(CeleryTasksTestCase): - def setUp(self): - super(TestUpgradeScreenly, self).setUp() - self.upgrade_screenly_task = upgrade_screenly.apply(args=['test', 'true', 'true']) - self.upgrade_screenly_result = self.upgrade_screenly_task.get() - - @attr('fixme') - def test_state(self): - self.assertEqual(self.upgrade_screenly_task.state, 'SUCCESS') - - @attr('fixme') - def test_result(self): - self.assertEqual(self.upgrade_screenly_result, {'status': 'Invalid -b parameter.\n'}) - - class TestCleanup(CeleryTasksTestCase): def setUp(self): super(TestCleanup, self).setUp()