From 7279fdb40e58d0d265baf71c202a2203c133e687 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 10 Nov 2020 16:59:43 -0500 Subject: [PATCH 1/3] tests: normailze systest data paths for Windows See: #51. --- tests/system/test_system.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index 36a0516c8..b56086654 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -537,9 +537,15 @@ def test_bucket_get_blob_with_user_project(self): class TestStorageFiles(unittest.TestCase): FILES = { - "logo": {"path": DATA_DIRNAME + "/CloudPlatform_128px_Retina.png"}, - "big": {"path": DATA_DIRNAME + "/five-point-one-mb-file.zip"}, - "simple": {"path": DATA_DIRNAME + "/simple.txt"}, + "logo": { + "path": os.path.join(DATA_DIRNAME, "CloudPlatform_128px_Retina.png") + }, + "big": { + "path": os.path.join(DATA_DIRNAME, "five-point-one-mb-file.zip"), + }, + "simple": { + "path": os.path.join(DATA_DIRNAME, "simple.txt"), + }, } @classmethod From b87553a0d8c60d55c49ebe16156d9067193226db Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 10 Nov 2020 17:23:18 -0500 Subject: [PATCH 2/3] chore: blacken --- tests/system/test_system.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index b56086654..644d3e1d4 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -537,15 +537,9 @@ def test_bucket_get_blob_with_user_project(self): class TestStorageFiles(unittest.TestCase): FILES = { - "logo": { - "path": os.path.join(DATA_DIRNAME, "CloudPlatform_128px_Retina.png") - }, - "big": { - "path": os.path.join(DATA_DIRNAME, "five-point-one-mb-file.zip"), - }, - "simple": { - "path": os.path.join(DATA_DIRNAME, "simple.txt"), - }, + "logo": {"path": os.path.join(DATA_DIRNAME, "CloudPlatform_128px_Retina.png")}, + "big": {"path": os.path.join(DATA_DIRNAME, "five-point-one-mb-file.zip"),}, + "simple": {"path": os.path.join(DATA_DIRNAME, "simple.txt"),}, } @classmethod From 4ef15bfe3b41bb7c5f6f1bc9b2bcb3a25601a00a Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 10 Nov 2020 17:45:54 -0500 Subject: [PATCH 3/3] chore: grrrr --- tests/system/test_system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/test_system.py b/tests/system/test_system.py index 644d3e1d4..63e881bf2 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -538,8 +538,8 @@ class TestStorageFiles(unittest.TestCase): FILES = { "logo": {"path": os.path.join(DATA_DIRNAME, "CloudPlatform_128px_Retina.png")}, - "big": {"path": os.path.join(DATA_DIRNAME, "five-point-one-mb-file.zip"),}, - "simple": {"path": os.path.join(DATA_DIRNAME, "simple.txt"),}, + "big": {"path": os.path.join(DATA_DIRNAME, "five-point-one-mb-file.zip")}, + "simple": {"path": os.path.join(DATA_DIRNAME, "simple.txt")}, } @classmethod