diff --git a/tests/providers/box/test_provider.py b/tests/providers/box/test_provider.py index 5e89bfe20..f3b670b3f 100644 --- a/tests/providers/box/test_provider.py +++ b/tests/providers/box/test_provider.py @@ -880,11 +880,8 @@ def test_will_self_overwrite(self, provider, other_provider): dest_path = WaterButlerPath('/50 shades of nope2223.txt', _ids=(provider.folder, '2342sdfsd')) - result = provider.will_self_overwrite(other_provider, src_path, dest_path) - assert result is False - - result = provider.will_self_overwrite(other_provider, src_path, src_path) - assert result is True + assert provider.will_self_overwrite(other_provider, src_path, dest_path) is False + assert provider.will_self_overwrite(other_provider, src_path, src_path) is True def test_can_duplicate_names(self, provider): assert provider.can_duplicate_names() is False diff --git a/tests/providers/dropbox/test_provider.py b/tests/providers/dropbox/test_provider.py index 4d1f2eb84..1b0b55207 100644 --- a/tests/providers/dropbox/test_provider.py +++ b/tests/providers/dropbox/test_provider.py @@ -931,11 +931,8 @@ def test_will_self_overwrite(self, provider, other_provider): dest_path = WaterButlerPath('/50 shades of nope2223.txt', _ids=(provider.folder, '2342sdfsd')) - result = provider.will_self_overwrite(other_provider, src_path, dest_path) - assert result is False - - result = provider.will_self_overwrite(other_provider, src_path, src_path) - assert result is True + assert provider.will_self_overwrite(other_provider, src_path, dest_path) is False + assert provider.will_self_overwrite(other_provider, src_path, src_path) is True def test_can_intra_copy(self, provider): assert provider.can_intra_copy(provider) diff --git a/tests/providers/googledrive/test_provider.py b/tests/providers/googledrive/test_provider.py index 6c856fc76..d6ee06a1d 100644 --- a/tests/providers/googledrive/test_provider.py +++ b/tests/providers/googledrive/test_provider.py @@ -1608,11 +1608,8 @@ def test_will_self_overwrite(self, provider, other_provider): src_path = GoogleDrivePath('/root/Gear1.stl', _ids=['0', '10', '11']) dest_path = GoogleDrivePath('/root/Gear23123.stl', _ids=['0', '10', '12']) - result = provider.will_self_overwrite(other_provider, src_path, dest_path) - assert result is False - - result = provider.will_self_overwrite(other_provider, src_path, src_path) - assert result is True + assert provider.will_self_overwrite(other_provider, src_path, dest_path) is False + assert provider.will_self_overwrite(other_provider, src_path, src_path) is True def test_can_duplicate_names(self, provider): assert provider.can_duplicate_names() is True diff --git a/tests/providers/owncloud/test_provider.py b/tests/providers/owncloud/test_provider.py index bf36767fb..6d5489c2f 100644 --- a/tests/providers/owncloud/test_provider.py +++ b/tests/providers/owncloud/test_provider.py @@ -380,11 +380,8 @@ def test_will_self_overwrite(self, provider): dest_path = WaterButlerPath('/50 shades of nope2223.txt', _ids=(provider.folder, '2342sdfsd')) - result = provider.will_self_overwrite(provider, src_path, dest_path) - assert result is False - - result = provider.will_self_overwrite(provider, src_path, src_path) - assert result is True + assert provider.will_self_overwrite(provider, src_path, dest_path) is False + assert provider.will_self_overwrite(provider, src_path, src_path) is True def test_can_intra_copy(self, provider, provider_different_credentials): assert provider.can_intra_copy(provider) diff --git a/waterbutler/core/provider.py b/waterbutler/core/provider.py index c82df5238..8b15e2a5c 100644 --- a/waterbutler/core/provider.py +++ b/waterbutler/core/provider.py @@ -445,9 +445,9 @@ def will_self_overwrite(self, dest_provider: 'BaseProvider', src_path: wb_path.WaterButlerPath, dest_path: wb_path.WaterButlerPath) -> bool: - """ Return wether a move or copy operation will result in a self-overwrite. + """Return wether a move or copy operation will result in a self-overwrite. - .. note:: + .. note:: Defaults to False Overridden by providers that need to run this check