@@ -873,12 +873,20 @@ def test_os_rename(self):
873873 def test_file_object (self ):
874874 st = self .wg .stage
875875
876- st .mkdir ('obj_test' )
877- st .mkdir ('obj_test/nest_1' )
876+ obj_test_dir = f'obj_test_{ id (self )} '
878877
879- f1 = st .upload_file (TEST_DIR / 'test.sql' , 'obj_test.sql' )
880- f2 = st .upload_file (TEST_DIR / 'test.sql' , 'obj_test/nest_1/obj_test.sql' )
881- d2 = st .info ('obj_test/nest_1/' )
878+ st .mkdir (obj_test_dir )
879+ st .mkdir (f'{ obj_test_dir } /nest_1' )
880+
881+ obj_test_sql = f'obj_test_{ id (self )} .sql'
882+ obj_test_2_sql = f'obj_test_2_{ id (self )} .sql'
883+
884+ f1 = st .upload_file (TEST_DIR / 'test.sql' , obj_test_sql )
885+ f2 = st .upload_file (
886+ TEST_DIR / 'test.sql' ,
887+ f'{ obj_test_dir } /nest_1/{ obj_test_sql } ' ,
888+ )
889+ d2 = st .info (f'{ obj_test_dir } /nest_1/' )
882890
883891 # is_file / is_dir
884892 assert not f1 .is_dir ()
@@ -889,17 +897,17 @@ def test_file_object(self):
889897 assert not d2 .is_file ()
890898
891899 # abspath / basename / dirname / exists
892- assert f1 .abspath () == 'obj_test.sql'
893- assert f1 .basename () == 'obj_test.sql'
900+ assert f1 .abspath () == obj_test_sql
901+ assert f1 .basename () == obj_test_sql
894902 assert f1 .dirname () == '/'
895903 assert f1 .exists ()
896- assert f2 .abspath () == 'obj_test /nest_1/obj_test.sql '
897- assert f2 .basename () == 'obj_test.sql'
898- assert f2 .dirname () == 'obj_test /nest_1/'
904+ assert f2 .abspath () == f' { obj_test_dir } /nest_1/{ obj_test_sql } '
905+ assert f2 .basename () == obj_test_sql
906+ assert f2 .dirname () == f' { obj_test_dir } /nest_1/'
899907 assert f2 .exists ()
900- assert d2 .abspath () == 'obj_test /nest_1/'
908+ assert d2 .abspath () == f' { obj_test_dir } /nest_1/'
901909 assert d2 .basename () == 'nest_1'
902- assert d2 .dirname () == 'obj_test /'
910+ assert d2 .dirname () == f' { obj_test_dir } /'
903911 assert d2 .exists ()
904912
905913 # download
@@ -910,9 +918,9 @@ def test_file_object(self):
910918 with self .assertRaises (IsADirectoryError ):
911919 d2 .remove ()
912920
913- assert st .is_file ('obj_test.sql' )
921+ assert st .is_file (obj_test_sql )
914922 f1 .remove ()
915- assert not st .is_file ('obj_test.sql' )
923+ assert not st .is_file (obj_test_sql )
916924
917925 # removedirs
918926 with self .assertRaises (NotADirectoryError ):
@@ -923,8 +931,8 @@ def test_file_object(self):
923931 assert not st .exists (d2 .path )
924932
925933 # rmdir
926- f1 = st .upload_file (TEST_DIR / 'test.sql' , 'obj_test.sql' )
927- d2 = st .mkdir ('obj_test /nest_1' )
934+ f1 = st .upload_file (TEST_DIR / 'test.sql' , obj_test_sql )
935+ d2 = st .mkdir (f' { obj_test_dir } /nest_1' )
928936
929937 assert st .exists (f1 .path )
930938 assert st .exists (d2 .path )
@@ -937,20 +945,20 @@ def test_file_object(self):
937945
938946 d2 .rmdir ()
939947
940- assert not st .exists ('obj_test /nest_1/' )
941- assert not st .exists ('obj_test' )
948+ assert not st .exists (f' { obj_test_dir } /nest_1/' )
949+ assert not st .exists (obj_test_dir )
942950
943951 # mtime / ctime
944952 assert f1 .getmtime () > 0
945953 assert f1 .getctime () > 0
946954
947955 # rename
948- assert st .exists ('obj_test.sql' )
949- assert not st .exists ('obj_test_2.sql' )
950- f1 .rename ('obj_test_2.sql' )
951- assert not st .exists ('obj_test.sql' )
952- assert st .exists ('obj_test_2.sql' )
953- assert f1 .abspath () == 'obj_test_2.sql'
956+ assert st .exists (obj_test_sql )
957+ assert not st .exists (obj_test_2_sql )
958+ f1 .rename (obj_test_2_sql )
959+ assert not st .exists (obj_test_sql )
960+ assert st .exists (obj_test_2_sql )
961+ assert f1 .abspath () == obj_test_2_sql
954962
955963
956964@pytest .mark .management
0 commit comments