@@ -226,7 +226,6 @@ def mkdirs(_):
226
226
yield path_to , read , write , mkdirs , posixpath .join , None
227
227
228
228
229
- # TODO(vnvo2409): some tests with `gcs` are falling.
230
229
@pytest .fixture (scope = "module" )
231
230
def gcs_fs ():
232
231
if should_skip (GCS_URI ):
@@ -340,7 +339,7 @@ def test_io_read_file(fs, patchs, monkeypatch):
340
339
341
340
342
341
@pytest .mark .parametrize (
343
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), (AZ_DSN_URI , None )], indirect = ["fs" ]
342
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), (AZ_DSN_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
344
343
)
345
344
def test_io_write_file (fs , patchs , monkeypatch ):
346
345
_ , path_to , read , _ , _ , _ , _ = fs
@@ -471,7 +470,7 @@ def test_dataset_from_remote_filename(fs, patchs, monkeypatch):
471
470
472
471
473
472
@pytest .mark .parametrize (
474
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
473
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
475
474
)
476
475
def test_gfile_GFile_writable (fs , patchs , monkeypatch ):
477
476
uri , path_to , read , _ , _ , _ , _ = fs
@@ -500,7 +499,7 @@ def test_gfile_GFile_writable(fs, patchs, monkeypatch):
500
499
501
500
502
501
@pytest .mark .parametrize (
503
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
502
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
504
503
)
505
504
def test_gfile_isdir (fs , patchs , monkeypatch ):
506
505
_ , path_to , _ , write , mkdirs , join , _ = fs
@@ -518,10 +517,10 @@ def test_gfile_isdir(fs, patchs, monkeypatch):
518
517
519
518
520
519
@pytest .mark .parametrize (
521
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
520
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
522
521
)
523
522
def test_gfile_listdir (fs , patchs , monkeypatch ):
524
- _ , path_to , _ , write , mkdirs , join , _ = fs
523
+ uri , path_to , _ , write , mkdirs , join , _ = fs
525
524
mock_patchs (monkeypatch , patchs )
526
525
527
526
root_path = "test_gfile_listdir"
@@ -531,6 +530,10 @@ def test_gfile_listdir(fs, patchs, monkeypatch):
531
530
num_childs = 5
532
531
childrens = [None ] * num_childs
533
532
childrens [0 ] = join (dname , "subdir" )
533
+ # TODO(vnvo2409): `gs` filesystem requires `/` at the end of directory's path.
534
+ # Consider if we could change the behavior for matching the other filesystems.
535
+ if uri == GCS_URI :
536
+ childrens [0 ] += "/"
534
537
mkdirs (childrens [0 ])
535
538
536
539
body = b"123456789"
@@ -544,7 +547,7 @@ def test_gfile_listdir(fs, patchs, monkeypatch):
544
547
545
548
546
549
@pytest .mark .parametrize (
547
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
550
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
548
551
)
549
552
def test_gfile_makedirs (fs , patchs , monkeypatch ):
550
553
_ , path_to , _ , write , _ , join , _ = fs
@@ -581,7 +584,7 @@ def test_gfile_remove(fs, patchs, monkeypatch):
581
584
582
585
583
586
@pytest .mark .parametrize (
584
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
587
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
585
588
)
586
589
def test_gfile_rmtree (fs , patchs , monkeypatch ):
587
590
_ , path_to , _ , write , mkdirs , join , _ = fs
@@ -658,7 +661,7 @@ def test_gfile_rename(fs, patchs, monkeypatch):
658
661
659
662
660
663
@pytest .mark .parametrize (
661
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
664
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
662
665
)
663
666
def test_gfile_glob (fs , patchs , monkeypatch ):
664
667
_ , path_to , _ , write , _ , join , _ = fs
0 commit comments