From f1ae92b3ab59418bfeb603e39840494ad478f8a5 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 14 Jan 2021 19:03:22 +0200 Subject: [PATCH 1/2] tests: upgrade azurite and enable loose mode Azure tests started failing recently. They still work with real azure, so this is on azurite side. --- tests/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 7dfab75de6..6cd84986b4 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -2,7 +2,8 @@ version: '3.2' services: azurite: - image: mcr.microsoft.com/azure-storage/azurite:3.9.0 + image: mcr.microsoft.com/azure-storage/azurite:3.10.0 + command: azurite -L -l /data --blobHost 0.0.0.0 --queueHost 0.0.0.0 ports: - "10000" oss: From 41640c6eb5f0f0f233f6a639fbfeead6c3aa49b1 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 14 Jan 2021 19:30:43 +0200 Subject: [PATCH 2/2] tests: use cloud instead of workspace also gdrive doesn't support it yet :( --- tests/func/test_tree.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/func/test_tree.py b/tests/func/test_tree.py index 2d5db2672f..afe4d5e5d4 100644 --- a/tests/func/test_tree.py +++ b/tests/func/test_tree.py @@ -279,20 +279,18 @@ def test_walk_dont_ignore_subrepos(tmp_dir, scm, dvc): @pytest.mark.parametrize( - "workspace", + "cloud", [ pytest.lazy_fixture("local_cloud"), pytest.lazy_fixture("s3"), pytest.lazy_fixture("gs"), - pytest.lazy_fixture("gdrive"), pytest.lazy_fixture("hdfs"), pytest.lazy_fixture("http"), ], - indirect=True, ) -def test_tree_getsize(dvc, workspace): - workspace.gen({"data": {"foo": "foo"}, "baz": "baz baz"}) - tree = get_cloud_tree(dvc, url=workspace.url) +def test_tree_getsize(dvc, cloud): + cloud.gen({"data": {"foo": "foo"}, "baz": "baz baz"}) + tree = get_cloud_tree(dvc, **cloud.config) path_info = tree.path_info assert tree.getsize(path_info / "baz") == 7