-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
87 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
diff a/dvc_s3/tests/test_dvc.py b/dvc_s3/tests/test_dvc.py (rejected hunks) | ||
@@ -5,52 +5,58 @@ from dvc.testing.api_tests import ( # noqa, pylint: disable=unused-import | ||
from dvc.testing.remote_tests import ( # noqa, pylint: disable=unused-import | ||
TestRemote, | ||
) | ||
+from dvc.testing.workspace_tests import TestAdd as _TestAdd | ||
from dvc.testing.workspace_tests import ( # noqa, pylint: disable=unused-import | ||
- TestAdd, | ||
- TestImport, | ||
+ TestGetUrl, | ||
+) | ||
+from dvc.testing.workspace_tests import TestImport as _TestImport | ||
+from dvc.testing.workspace_tests import ( # noqa, pylint: disable=unused-import | ||
+ TestLsUrl, | ||
) | ||
|
||
|
||
@pytest.fixture | ||
-def cloud_name(): | ||
- return "s3" | ||
+def cloud(make_cloud): | ||
+ yield make_cloud(typ="s3") | ||
|
||
|
||
@pytest.fixture | ||
-def remote(make_remote, cloud_name): | ||
- yield make_remote(name="upstream", typ=cloud_name) | ||
+def remote(make_remote): | ||
+ yield make_remote(name="upstream", typ="s3") | ||
|
||
|
||
@pytest.fixture | ||
-def workspace(make_workspace, cloud_name): | ||
- yield make_workspace(name="workspace", typ=cloud_name) | ||
+def workspace(make_workspace): | ||
+ yield make_workspace(name="workspace", typ="s3") | ||
|
||
|
||
-@pytest.fixture | ||
-def stage_md5(): | ||
- raise NotImplementedError | ||
+class TestImport(_TestImport): | ||
+ @pytest.fixture | ||
+ def stage_md5(self): | ||
+ raise NotImplementedError | ||
|
||
|
||
-@pytest.fixture | ||
-def is_object_storage(): | ||
- raise NotImplementedError | ||
+ @pytest.fixture | ||
+ def is_object_storage(self): | ||
+ raise NotImplementedError | ||
|
||
|
||
-@pytest.fixture | ||
-def dir_md5(): | ||
- raise NotImplementedError | ||
+ @pytest.fixture | ||
+ def dir_md5(self): | ||
+ raise NotImplementedError | ||
|
||
|
||
-@pytest.fixture | ||
-def hash_name(): | ||
- raise NotImplementedError | ||
+class TestAdd(_TestAdd): | ||
+ @pytest.fixture | ||
+ def hash_name(self): | ||
+ raise NotImplementedError | ||
|
||
|
||
-@pytest.fixture | ||
-def hash_value(): | ||
- raise NotImplementedError | ||
+ @pytest.fixture | ||
+ def hash_value(self): | ||
+ raise NotImplementedError | ||
|
||
|
||
-@pytest.fixture | ||
-def dir_hash_value(dir_md5): | ||
- raise NotImplementedError | ||
+ @pytest.fixture | ||
+ def dir_hash_value(self): | ||
+ raise NotImplementedError |