@@ -1190,7 +1190,7 @@ def test_skip_extensions_step(self):
1190
1190
"ext1",
1191
1191
("EXT-2", "42", {"source_tmpl": "dummy.tgz"}),
1192
1192
("ext3", "1.1", {"source_tmpl": "dummy.tgz", "modulename": "real_ext"}),
1193
- "ext4",
1193
+ ( "ext4", "0.2", {"source_tmpl": "dummy.tgz", "modulename": False}) ,
1194
1194
]
1195
1195
exts_filter = ("\
1196
1196
if [ %(ext_name)s == 'ext_2' ] && [ %(ext_version)s == '42' ] && [[ %(src)s == *dummy.tgz ]];\
@@ -1206,20 +1206,24 @@ def test_skip_extensions_step(self):
1206
1206
eb .installdir = config .install_path ()
1207
1207
eb .skip = True
1208
1208
1209
- self .mock_stdout (True )
1210
- eb .extensions_step (fetch = True )
1211
- stdout = self .get_stdout ()
1212
- self .mock_stdout (False )
1209
+ with self .mocked_stdout_stderr ():
1210
+ eb .extensions_step (fetch = True )
1211
+ stdout = self .get_stdout ()
1212
+ logtxt = read_file (eb .logfile )
1213
+ self .assertRegex (logtxt , r"Running shell command\W+if \[ ext1" )
1214
+ self .assertRegex (logtxt , r"Running shell command\W+if \[ ext_2" )
1215
+ self .assertRegex (logtxt , r"Running shell command\W+if \[ real_ext" )
1216
+ # modulename: False skips the check
1217
+ self .assertNotRegex (logtxt , r"Running shell command\W+if \[ (False|ext4)" )
1213
1218
1214
1219
patterns = [
1215
1220
r"^== skipping extension EXT-2" ,
1216
1221
r"^== skipping extension ext3" ,
1217
1222
r"^== installing extension ext1 \(1/2\)\.\.\." ,
1218
- r"^== installing extension ext4 \(2/2\)\.\.\." ,
1223
+ r"^== installing extension ext4 0.2 \(2/2\)\.\.\." ,
1219
1224
]
1220
1225
for pattern in patterns :
1221
- regex = re .compile (pattern , re .M )
1222
- self .assertTrue (regex .search (stdout ), "Pattern '%s' found in: %s" % (regex .pattern , stdout ))
1226
+ self .assertRegex (stdout , re .compile (pattern , re .M ))
1223
1227
1224
1228
# 'ext1' should be in eb.ext_instances
1225
1229
eb_exts = [x .name for x in eb .ext_instances ]
0 commit comments