@@ -5777,12 +5777,21 @@ def test_sanity_check_only(self):
57775777
57785778 test_ec = os .path .join (self .test_prefix , 'test.ec' )
57795779 test_ec_txt = read_file (toy_ec )
5780- test_ec_txt += "\n sanity_check_commands = ['toy']"
5780+ test_ec_txt += '\n ' + '\n ' .join ([
5781+ "sanity_check_commands = ['barbar', 'toy']" ,
5782+ "sanity_check_paths = {'files': ['bin/barbar', 'bin/toy'], 'dirs': ['bin']}" ,
5783+ "exts_list = [" ,
5784+ " ('barbar', '0.0', {" ,
5785+ " 'start_dir': 'src'," ,
5786+ " })" ,
5787+ "]" ,
5788+ ])
57815789 write_file (test_ec , test_ec_txt )
57825790
57835791 # sanity check fails if software was not installed yet
57845792 outtxt , error_thrown = self .eb_main ([test_ec , '--sanity-check-only' ], do_build = True , return_error = True )
5785- self .assertTrue ("Sanity check failed: no file found at \\ 'bin/yot\\ ' or \\ 'bin/toy\\ '" in str (error_thrown ))
5793+ self .assertTrue ("Sanity check failed: no file found at \\ 'bin/barbar\\ '" in str (error_thrown ))
5794+ self .assertTrue ("no file found at \\ 'bin/toy\\ '" in str (error_thrown ))
57865795
57875796 # actually install, then try --sanity-check-only again;
57885797 # need to use --force to install toy because module already exists (but installation doesn't)
@@ -5821,13 +5830,14 @@ def test_sanity_check_only(self):
58215830 self .assertTrue ("== sanity checking..." in stdout )
58225831 self .assertTrue ("COMPLETED: Installation ended successfully" in stdout )
58235832 msgs = [
5824- "file 'bin/yot' or 'bin/toy' found: OK" ,
5833+ "file 'bin/barbar' found: OK" ,
5834+ "file 'bin/toy' found: OK" ,
58255835 "(non-empty) directory 'bin' found: OK" ,
58265836 "loading modules: toy/0.0..." ,
58275837 "result for command 'toy': OK" ,
58285838 ]
58295839 for msg in msgs :
5830- self .assertTrue (" >> %s" % msg in stdout )
5840+ self .assertTrue (" >> %s" % msg in stdout , "' >> %s' found in: %s" % ( msg , stdout ) )
58315841
58325842 def test_fake_vsc_include (self ):
58335843 """Test whether fake 'vsc' namespace is triggered for modules included via --include-*."""
0 commit comments