diff --git a/elodie/tests/elodie_test.py b/elodie/tests/elodie_test.py index 4a242c5..f5c57ea 100644 --- a/elodie/tests/elodie_test.py +++ b/elodie/tests/elodie_test.py @@ -38,7 +38,6 @@ def test_import_file_text(): assert helper.path_tz_fix(os.path.join('2016-04-Apr','Unknown Location','2016-04-07_11-15-26-valid-sample-title.txt')) in dest_path, dest_path def test_import_file_audio(): - raise SkipTest('gh-61 this test fails on travisci') temporary_folder, folder = helper.create_working_folder() temporary_folder_destination, folder_destination = helper.create_working_folder() @@ -52,7 +51,7 @@ def test_import_file_audio(): shutil.rmtree(folder) shutil.rmtree(folder_destination) - assert helper.path_tz_fix(os.path.join('2016-01-Jan','Houston','2016-01-04_05-28-15-audio-test-audio.m4a')) in dest_path, dest_path + assert helper.path_tz_fix(os.path.join('2016-01-Jan','Houston','2016-01-04_05-28-15-audio.m4a')) in dest_path, dest_path def test_import_file_photo(): temporary_folder, folder = helper.create_working_folder() diff --git a/elodie/tests/media/audio_test.py b/elodie/tests/media/audio_test.py index cfc9cd2..8d7eafe 100644 --- a/elodie/tests/media/audio_test.py +++ b/elodie/tests/media/audio_test.py @@ -9,8 +9,6 @@ import tempfile import time import datetime -from nose.plugins.skip import SkipTest - sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))))) sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))) @@ -32,32 +30,28 @@ def test_audio_extensions(): assert extensions == valid_extensions, valid_extensions def test_get_coordinate(): - raise SkipTest('gh-61 this test fails on travisci') audio = Audio(helper.get_file('audio.m4a')) coordinate = audio.get_coordinate() - assert coordinate == 29.75893888888889, coordinate + assert helper.isclose(coordinate, 29.758938), coordinate def test_get_coordinate_latitude(): - raise SkipTest('gh-61 this test fails on travisci') audio = Audio(helper.get_file('audio.m4a')) coordinate = audio.get_coordinate('latitude') - assert coordinate == 29.75893888888889, coordinate + assert helper.isclose(coordinate, 29.758938), coordinate def test_get_coordinate_longitude(): - raise SkipTest('gh-61 this test fails on travisci') audio = Audio(helper.get_file('audio.m4a')) coordinate = audio.get_coordinate('longitude') - assert coordinate == -95.3677, coordinate + assert helper.isclose(coordinate, -95.3677), coordinate def test_get_date_taken(): - raise SkipTest('gh-32 this test fails on travisci') audio = Audio(helper.get_file('audio.m4a')) date_taken = audio.get_date_taken() - assert date_taken == (2016, 1, 4, 5, 24, 15, 0, 19, 0), date_taken + assert date_taken == (2016, 1, 4, 5, 28, 15, 0, 4, 0), date_taken def test_get_exiftool_attributes(): audio = Video(helper.get_file('audio.m4a')) @@ -169,7 +163,6 @@ def test_set_title(): assert metadata['title'] == 'my audio title', metadata['title'] def test_set_title_non_ascii(): - raise SkipTest('gh-27, non-ascii characters') temporary_folder, folder = helper.create_working_folder() origin = '%s/audio.m4a' % folder @@ -178,7 +171,8 @@ def test_set_title_non_ascii(): audio = Audio(origin) origin_metadata = audio.get_metadata() - status = audio.set_title('形声字 / 形聲字') + unicode_title = u'形声字 / 形聲字' + status = audio.set_title(unicode_title) assert status == True, status @@ -187,4 +181,4 @@ def test_set_title_non_ascii(): shutil.rmtree(folder) - assert metadata['title'] == '形声字 / 形聲字', metadata['title'] + assert metadata['title'] == unicode_title, metadata['title'] diff --git a/elodie/tests/media/photo_test.py b/elodie/tests/media/photo_test.py index 30bcbe8..b575d53 100644 --- a/elodie/tests/media/photo_test.py +++ b/elodie/tests/media/photo_test.py @@ -317,7 +317,7 @@ def _test_photo_type_get(type, date): if not photo_file: photo_file = helper.download_file(photo_name, folder) if not photo_file or not os.path.isfile(photo_file): - raise SkipTest('nef file not downlaoded') + raise SkipTest('{} file not downlaoded'.format(type)) # downloading for each test is costly so we save it in the working directory file_path_save_as = helper.get_file_path(photo_name) diff --git a/elodie/tests/media/video_test.py b/elodie/tests/media/video_test.py index 91ea516..5b5fedc 100644 --- a/elodie/tests/media/video_test.py +++ b/elodie/tests/media/video_test.py @@ -8,8 +8,6 @@ import tempfile import time import datetime -from nose.plugins.skip import SkipTest - sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))))) sys.path.insert(0, os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))) @@ -167,7 +165,6 @@ def test_set_title(): assert metadata['title'] == 'my video title', metadata['title'] def test_set_title_non_ascii(): - raise SkipTest('gh-27, non-ascii characters') temporary_folder, folder = helper.create_working_folder() origin = '%s/video.mov' % folder @@ -176,7 +173,8 @@ def test_set_title_non_ascii(): video = Video(origin) origin_metadata = video.get_metadata() - status = video.set_title('形声字 / 形聲字') + unicode_title = u'形声字 / 形聲字' + status = video.set_title(unicode_title) assert status == True, status @@ -185,4 +183,4 @@ def test_set_title_non_ascii(): shutil.rmtree(folder) - assert metadata['title'] == '形声字 / 形聲字', metadata['title'] + assert metadata['title'] == unicode_title, metadata['title']