@@ -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,9 @@ 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" ,
343
+ [(S3_URI , None ), (AZ_URI , None ), (AZ_DSN_URI , None ), (GCS_URI , None )],
344
+ indirect = ["fs" ],
344
345
)
345
346
def test_io_write_file (fs , patchs , monkeypatch ):
346
347
_ , path_to , read , _ , _ , _ , _ = fs
@@ -471,7 +472,7 @@ def test_dataset_from_remote_filename(fs, patchs, monkeypatch):
471
472
472
473
473
474
@pytest .mark .parametrize (
474
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
475
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
475
476
)
476
477
def test_gfile_GFile_writable (fs , patchs , monkeypatch ):
477
478
uri , path_to , read , _ , _ , _ , _ = fs
@@ -500,7 +501,7 @@ def test_gfile_GFile_writable(fs, patchs, monkeypatch):
500
501
501
502
502
503
@pytest .mark .parametrize (
503
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
504
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
504
505
)
505
506
def test_gfile_isdir (fs , patchs , monkeypatch ):
506
507
_ , path_to , _ , write , mkdirs , join , _ = fs
@@ -518,10 +519,10 @@ def test_gfile_isdir(fs, patchs, monkeypatch):
518
519
519
520
520
521
@pytest .mark .parametrize (
521
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
522
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
522
523
)
523
524
def test_gfile_listdir (fs , patchs , monkeypatch ):
524
- _ , path_to , _ , write , mkdirs , join , _ = fs
525
+ uri , path_to , _ , write , mkdirs , join , _ = fs
525
526
mock_patchs (monkeypatch , patchs )
526
527
527
528
root_path = "test_gfile_listdir"
@@ -531,6 +532,10 @@ def test_gfile_listdir(fs, patchs, monkeypatch):
531
532
num_childs = 5
532
533
childrens = [None ] * num_childs
533
534
childrens [0 ] = join (dname , "subdir" )
535
+ # TODO(vnvo2409): `gs` filesystem requires `/` at the end of directory's path.
536
+ # Consider if we could change the behavior for matching the other filesystems.
537
+ if uri == GCS_URI :
538
+ childrens [0 ] += "/"
534
539
mkdirs (childrens [0 ])
535
540
536
541
body = b"123456789"
@@ -544,7 +549,7 @@ def test_gfile_listdir(fs, patchs, monkeypatch):
544
549
545
550
546
551
@pytest .mark .parametrize (
547
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
552
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
548
553
)
549
554
def test_gfile_makedirs (fs , patchs , monkeypatch ):
550
555
_ , path_to , _ , write , _ , join , _ = fs
@@ -581,7 +586,7 @@ def test_gfile_remove(fs, patchs, monkeypatch):
581
586
582
587
583
588
@pytest .mark .parametrize (
584
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
589
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
585
590
)
586
591
def test_gfile_rmtree (fs , patchs , monkeypatch ):
587
592
_ , path_to , _ , write , mkdirs , join , _ = fs
@@ -658,7 +663,7 @@ def test_gfile_rename(fs, patchs, monkeypatch):
658
663
659
664
660
665
@pytest .mark .parametrize (
661
- "fs, patchs" , [(S3_URI , None ), (AZ_URI , None )], indirect = ["fs" ]
666
+ "fs, patchs" , [(S3_URI , None ), (AZ_URI , None ), ( GCS_URI , None ) ], indirect = ["fs" ]
662
667
)
663
668
def test_gfile_glob (fs , patchs , monkeypatch ):
664
669
_ , path_to , _ , write , _ , join , _ = fs
0 commit comments