@@ -1117,9 +1117,15 @@ def test_cm_is_reentrant(self):
1117
1117
1118
1118
1119
1119
class TestChdir (unittest .TestCase ):
1120
+ def make_relative_path (self , * parts ):
1121
+ return os .path .join (
1122
+ os .path .dirname (os .path .realpath (__file__ )),
1123
+ * parts ,
1124
+ )
1125
+
1120
1126
def test_simple (self ):
1121
1127
old_cwd = os .getcwd ()
1122
- target = os . path . join ( os . path . dirname ( __file__ ), 'data' )
1128
+ target = self . make_relative_path ( 'data' )
1123
1129
self .assertNotEqual (old_cwd , target )
1124
1130
1125
1131
with chdir (target ):
@@ -1128,8 +1134,8 @@ def test_simple(self):
1128
1134
1129
1135
def test_reentrant (self ):
1130
1136
old_cwd = os .getcwd ()
1131
- target1 = os . path . join ( os . path . dirname ( __file__ ), 'data' )
1132
- target2 = os . path . join ( os . path . dirname ( __file__ ), 'ziptestdata' )
1137
+ target1 = self . make_relative_path ( 'data' )
1138
+ target2 = self . make_relative_path ( 'ziptestdata' )
1133
1139
self .assertNotIn (old_cwd , (target1 , target2 ))
1134
1140
chdir1 , chdir2 = chdir (target1 ), chdir (target2 )
1135
1141
@@ -1145,7 +1151,7 @@ def test_reentrant(self):
1145
1151
1146
1152
def test_exception (self ):
1147
1153
old_cwd = os .getcwd ()
1148
- target = os . path . join ( os . path . dirname ( __file__ ), 'data' )
1154
+ target = self . make_relative_path ( 'data' )
1149
1155
self .assertNotEqual (old_cwd , target )
1150
1156
1151
1157
try :
0 commit comments