Refactor verbose 931 (#960)
* Began refactoring verbose code for #931 * Fixed tests for timewarp due to verbose refactor * Updated test data * More refactoring for #931 * Refactored queryoptions.py * Refactored queryoptions.py * Refactored queryoptions.py * Refactored echo_error * Refactored debug * Refactored debug * Refactored use of verbose in export * Refactored use of verbose in export * Refactred --verbose in add-locations and debug-dump * Refactored --verbose for * Refactored --verbose for osxphotos exportdb * Refactored --verbose for osxphotos import * Refactored --verbose for osxphotos orphans * Refactored --verbose for osxphotos snap-diff * Refactored --verbose for osxphotos sync * Refactored --verbose for osxphotos timewarp * Added default verbose() function to verbose
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
|
||||
import pytest
|
||||
|
||||
from osxphotos.queryoptions import load_uuid_from_file
|
||||
|
||||
UUID_FILE = "tests/uuid_from_file.txt"
|
||||
MISSING_UUID_FILE = "tests/uuid_not_found.txt"
|
||||
|
||||
@@ -13,8 +15,7 @@ UUID_EXPECTED_FROM_FILE = [
|
||||
|
||||
|
||||
def test_load_uuid_from_file():
|
||||
"""Test load_uuid_from_file function """
|
||||
from osxphotos.cli import load_uuid_from_file
|
||||
"""Test load_uuid_from_file function"""
|
||||
|
||||
uuid_got = load_uuid_from_file(UUID_FILE)
|
||||
assert uuid_got == UUID_EXPECTED_FROM_FILE
|
||||
@@ -22,7 +23,6 @@ def test_load_uuid_from_file():
|
||||
|
||||
def test_load_uuid_from_file_filenotfound():
|
||||
"""Test load_uuid_from_file function raises error if file not found"""
|
||||
from osxphotos.cli import load_uuid_from_file
|
||||
|
||||
with pytest.raises(FileNotFoundError) as err:
|
||||
uuid_got = load_uuid_from_file(MISSING_UUID_FILE)
|
||||
|
||||
Reference in New Issue
Block a user