diff --git a/elodie/tests/files/.DS_Store b/elodie/tests/files/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/elodie/tests/files/.DS_Store and /dev/null differ diff --git a/elodie/tests/run_tests.py b/run_tests.py similarity index 92% rename from elodie/tests/run_tests.py rename to run_tests.py index a03fdea..060bd1e 100755 --- a/elodie/tests/run_tests.py +++ b/run_tests.py @@ -8,14 +8,14 @@ import tempfile if __name__ == "__main__": # test_directory is what we pass nose.run for where to find tests - test_directory = os.path.dirname(os.path.abspath(__file__)) + test_directory = os.path.abspath('tests') # create a temporary directory to use for the application directory while running tests temporary_application_directory = tempfile.mkdtemp('-elodie-tests') os.environ['ELODIE_APPLICATION_DIRECTORY'] = temporary_application_directory # copy config.ini-sample over to the test application directory - temporary_config_file_sample = '{}/config.ini-sample'.format(os.path.dirname(os.path.dirname(test_directory))) + temporary_config_file_sample = '{}/config.ini-sample'.format(os.path.dirname(test_directory)) temporary_config_file = '{}/config.ini'.format(temporary_application_directory) shutil.copy2( temporary_config_file_sample, diff --git a/elodie/tests/__init__.py b/tests/__init__.py similarity index 100% rename from elodie/tests/__init__.py rename to tests/__init__.py diff --git a/elodie/tests/config_test.py b/tests/config_test.py similarity index 100% rename from elodie/tests/config_test.py rename to tests/config_test.py diff --git a/elodie/tests/constants_test.py b/tests/constants_test.py similarity index 100% rename from elodie/tests/constants_test.py rename to tests/constants_test.py diff --git a/elodie/tests/dependencies_test.py b/tests/dependencies_test.py similarity index 100% rename from elodie/tests/dependencies_test.py rename to tests/dependencies_test.py diff --git a/elodie/tests/elodie_test.py b/tests/elodie_test.py similarity index 100% rename from elodie/tests/elodie_test.py rename to tests/elodie_test.py diff --git a/elodie/tests/files/Plain With Spaces And Uppercase 123.jpg b/tests/files/Plain With Spaces And Uppercase 123.jpg similarity index 100% rename from elodie/tests/files/Plain With Spaces And Uppercase 123.jpg rename to tests/files/Plain With Spaces And Uppercase 123.jpg diff --git a/elodie/tests/files/audio.m4a b/tests/files/audio.m4a similarity index 100% rename from elodie/tests/files/audio.m4a rename to tests/files/audio.m4a diff --git a/elodie/tests/files/imghdr-error.jpg b/tests/files/imghdr-error.jpg similarity index 100% rename from elodie/tests/files/imghdr-error.jpg rename to tests/files/imghdr-error.jpg diff --git a/elodie/tests/files/invalid.invalid b/tests/files/invalid.invalid similarity index 100% rename from elodie/tests/files/invalid.invalid rename to tests/files/invalid.invalid diff --git a/elodie/tests/files/invalid.jpg b/tests/files/invalid.jpg similarity index 100% rename from elodie/tests/files/invalid.jpg rename to tests/files/invalid.jpg diff --git a/elodie/tests/files/no-exif.jpg b/tests/files/no-exif.jpg similarity index 100% rename from elodie/tests/files/no-exif.jpg rename to tests/files/no-exif.jpg diff --git a/tests/files/photo.cr2 b/tests/files/photo.cr2 new file mode 100644 index 0000000..d38b029 Binary files /dev/null and b/tests/files/photo.cr2 differ diff --git a/elodie/tests/files/photo.heic b/tests/files/photo.heic similarity index 100% rename from elodie/tests/files/photo.heic rename to tests/files/photo.heic diff --git a/elodie/tests/files/photo.png b/tests/files/photo.png similarity index 100% rename from elodie/tests/files/photo.png rename to tests/files/photo.png diff --git a/elodie/tests/files/plain.jpg b/tests/files/plain.jpg similarity index 100% rename from elodie/tests/files/plain.jpg rename to tests/files/plain.jpg diff --git a/elodie/tests/files/plugins/googlephotos/auth_file.json b/tests/files/plugins/googlephotos/auth_file.json similarity index 100% rename from elodie/tests/files/plugins/googlephotos/auth_file.json rename to tests/files/plugins/googlephotos/auth_file.json diff --git a/elodie/tests/files/plugins/googlephotos/secrets_file.json b/tests/files/plugins/googlephotos/secrets_file.json similarity index 100% rename from elodie/tests/files/plugins/googlephotos/secrets_file.json rename to tests/files/plugins/googlephotos/secrets_file.json diff --git a/elodie/tests/files/withoutextension b/tests/files/text.txt similarity index 100% rename from elodie/tests/files/withoutextension rename to tests/files/text.txt diff --git a/elodie/tests/files/video.mov b/tests/files/video.mov similarity index 100% rename from elodie/tests/files/video.mov rename to tests/files/video.mov diff --git a/elodie/tests/files/with-album-and-title-and-location.jpg b/tests/files/with-album-and-title-and-location.jpg similarity index 100% rename from elodie/tests/files/with-album-and-title-and-location.jpg rename to tests/files/with-album-and-title-and-location.jpg diff --git a/elodie/tests/files/with-album-and-title.jpg b/tests/files/with-album-and-title.jpg similarity index 100% rename from elodie/tests/files/with-album-and-title.jpg rename to tests/files/with-album-and-title.jpg diff --git a/elodie/tests/files/with-album.jpg b/tests/files/with-album.jpg similarity index 100% rename from elodie/tests/files/with-album.jpg rename to tests/files/with-album.jpg diff --git a/elodie/tests/files/with-filename-and-title-in-exif.jpg b/tests/files/with-filename-and-title-in-exif.jpg similarity index 100% rename from elodie/tests/files/with-filename-and-title-in-exif.jpg rename to tests/files/with-filename-and-title-in-exif.jpg diff --git a/elodie/tests/files/with-filename-in-exif.jpg b/tests/files/with-filename-in-exif.jpg similarity index 100% rename from elodie/tests/files/with-filename-in-exif.jpg rename to tests/files/with-filename-in-exif.jpg diff --git a/elodie/tests/files/with-location-and-title.jpg b/tests/files/with-location-and-title.jpg similarity index 100% rename from elodie/tests/files/with-location-and-title.jpg rename to tests/files/with-location-and-title.jpg diff --git a/elodie/tests/files/with-location-inv.jpg b/tests/files/with-location-inv.jpg similarity index 100% rename from elodie/tests/files/with-location-inv.jpg rename to tests/files/with-location-inv.jpg diff --git a/elodie/tests/files/with-location-zero-coordinate.jpg b/tests/files/with-location-zero-coordinate.jpg similarity index 100% rename from elodie/tests/files/with-location-zero-coordinate.jpg rename to tests/files/with-location-zero-coordinate.jpg diff --git a/elodie/tests/files/with-location.jpg b/tests/files/with-location.jpg similarity index 100% rename from elodie/tests/files/with-location.jpg rename to tests/files/with-location.jpg diff --git a/elodie/tests/files/with-null-coordinates.jpg b/tests/files/with-null-coordinates.jpg similarity index 100% rename from elodie/tests/files/with-null-coordinates.jpg rename to tests/files/with-null-coordinates.jpg diff --git a/elodie/tests/files/with-original-name.jpg b/tests/files/with-original-name.jpg similarity index 100% rename from elodie/tests/files/with-original-name.jpg rename to tests/files/with-original-name.jpg diff --git a/elodie/tests/files/with-title.jpg b/tests/files/with-title.jpg similarity index 100% rename from elodie/tests/files/with-title.jpg rename to tests/files/with-title.jpg diff --git a/elodie/tests/media/__init__.py b/tests/files/withoutextension similarity index 100% rename from elodie/tests/media/__init__.py rename to tests/files/withoutextension diff --git a/elodie/tests/filesystem_test.py b/tests/filesystem_test.py similarity index 100% rename from elodie/tests/filesystem_test.py rename to tests/filesystem_test.py diff --git a/elodie/tests/geolocation_test.py b/tests/geolocation_test.py similarity index 100% rename from elodie/tests/geolocation_test.py rename to tests/geolocation_test.py diff --git a/elodie/tests/helper.py b/tests/helper.py similarity index 100% rename from elodie/tests/helper.py rename to tests/helper.py diff --git a/elodie/tests/localstorage_test.py b/tests/localstorage_test.py similarity index 100% rename from elodie/tests/localstorage_test.py rename to tests/localstorage_test.py diff --git a/elodie/tests/log_test.py b/tests/log_test.py similarity index 100% rename from elodie/tests/log_test.py rename to tests/log_test.py diff --git a/elodie/tests/plugins/__init__.py b/tests/media/__init__.py similarity index 100% rename from elodie/tests/plugins/__init__.py rename to tests/media/__init__.py diff --git a/elodie/tests/media/audio_test.py b/tests/media/audio_test.py similarity index 100% rename from elodie/tests/media/audio_test.py rename to tests/media/audio_test.py diff --git a/elodie/tests/media/base_test.py b/tests/media/base_test.py similarity index 100% rename from elodie/tests/media/base_test.py rename to tests/media/base_test.py diff --git a/elodie/tests/media/media_test.py b/tests/media/media_test.py similarity index 100% rename from elodie/tests/media/media_test.py rename to tests/media/media_test.py diff --git a/elodie/tests/media/photo_test.py b/tests/media/photo_test.py similarity index 100% rename from elodie/tests/media/photo_test.py rename to tests/media/photo_test.py diff --git a/elodie/tests/media/video_test.py b/tests/media/video_test.py similarity index 100% rename from elodie/tests/media/video_test.py rename to tests/media/video_test.py diff --git a/elodie/tests/plugins/googlephotos/__init__.py b/tests/plugins/__init__.py similarity index 100% rename from elodie/tests/plugins/googlephotos/__init__.py rename to tests/plugins/__init__.py diff --git a/tests/plugins/googlephotos/__init__.py b/tests/plugins/googlephotos/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/elodie/tests/plugins/googlephotos/googlephotos_test.py b/tests/plugins/googlephotos/googlephotos_test.py similarity index 100% rename from elodie/tests/plugins/googlephotos/googlephotos_test.py rename to tests/plugins/googlephotos/googlephotos_test.py diff --git a/elodie/tests/plugins_test.py b/tests/plugins_test.py similarity index 100% rename from elodie/tests/plugins_test.py rename to tests/plugins_test.py diff --git a/elodie/tests/requirements.txt b/tests/requirements.txt similarity index 100% rename from elodie/tests/requirements.txt rename to tests/requirements.txt diff --git a/elodie/tests/result_test.py b/tests/result_test.py similarity index 100% rename from elodie/tests/result_test.py rename to tests/result_test.py