From: <rom...@us...> - 2007-11-14 18:25:15
|
Revision: 1153 http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1153&view=rev Author: roman_yakovenko Date: 2007-11-14 10:25:20 -0800 (Wed, 14 Nov 2007) Log Message: ----------- improving naming scheme Modified Paths: -------------- pyplusplus_dev/unittests/test_all.py Modified: pyplusplus_dev/unittests/test_all.py =================================================================== --- pyplusplus_dev/unittests/test_all.py 2007-11-14 07:16:10 UTC (rev 1152) +++ pyplusplus_dev/unittests/test_all.py 2007-11-14 18:25:20 UTC (rev 1153) @@ -167,20 +167,26 @@ self.__update() + def __create_unique_name( self, name ): + if '__main__.' in name: + name = name.replace( '__main__', os.path.basename( self.module.__file__)[:-4] ) + return name + def __update( self ): match_found = self.bottom_line_re.search( self.output ) if match_found: self.num_of_tests += int( match_found.group( 'num_of_tests' ) ) self.total_run_time += float( match_found.group( 'seconds' ) ) + uname = self.__create_unique_name for match_found in self.test_name_re.finditer( self.output ): - self.test_results[ match_found.group( 'name' ) ] = 'ok' + self.test_results[ uname( match_found.group( 'name' ) ) ] = 'ok' for match_found in self.failed_test_re.finditer( self.output ): - self.test_results[ match_found.group( 'name' ) ] = 'FAIL' + self.test_results[ uname( match_found.group( 'name' ) ) ] = 'FAIL' for match_found in self.error_test_re.finditer( self.output ): - self.test_results[ match_found.group( 'name' ) ] = 'ERROR' + self.test_results[ uname( match_found.group( 'name' ) ) ] = 'ERROR' assert( self.num_of_tests == len( self.test_results ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |