Skip to content

Commit

Permalink
use screenly logo as test image
Browse files Browse the repository at this point in the history
  • Loading branch information
pain64 committed Oct 19, 2016
1 parent f352720 commit 2371c8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ before_script:
- cp ansible/roles/screenly/files/screenly.conf ~/.screenly/
- cp ansible/roles/screenly/files/screenly.db ~/.screenly/
- echo -e "[local]\nlocalhost ansible_connection=local" > ansible/localhost
- curl http://orig04.deviantart.net/7f89/f/2016/173/7/0/ussr_tyan_by_kawaielli-da76ghz.jpg > /tmp/image.jpg
- curl https://www.screenly.io/upload/ose-logo.png > /tmp/image.png
- curl https://www.screenly.io/upload/ose_tests/little_buck_bunny_trailer_480p.mov > /tmp/video.mov
- export DISPLAY=:99.0
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16
Expand Down
4 changes: 2 additions & 2 deletions tests/splinter_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_edit_asset(self):
self.assertEqual(asset['duration'], u'333')

def test_add_asset_image_upload(self):
image_file = '/tmp/image.jpg'
image_file = '/tmp/image.png'

with Browser() as browser:
browser.visit('http://localhost:8080')
Expand All @@ -136,7 +136,7 @@ def test_add_asset_image_upload(self):
self.assertEqual(len(assets), 1)
asset = assets[0]

self.assertEqual(asset['name'], u'image.jpg')
self.assertEqual(asset['name'], u'image.png')
self.assertEqual(asset['mimetype'], u'image')
self.assertEqual(asset['duration'], u'30')

Expand Down

0 comments on commit 2371c8e

Please sign in to comment.