2 new changesets in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/6f881204cc20/ changeset: r5167:6f881204cc20 user: natefoo date: 2011-03-03 18:21:22 summary: Cause lines_diff on pdf test outputs to only count the lines of a pdf which are not already ignored. affected #: 1 file (346 bytes) --- a/test/base/twilltestcase.py Thu Mar 03 12:03:41 2011 -0500 +++ b/test/base/twilltestcase.py Thu Mar 03 12:21:22 2011 -0500 @@ -64,7 +64,6 @@ allowed_diff_count = int(attributes.get( 'lines_diff', 0 )) diff = list( difflib.unified_diff( local_file, history_data, "local_file", "history_data" ) ) diff_lines = get_lines_diff( diff ) - log.debug('## files diff on %s and %s lines_diff=%d, found diff = %d' % (file1,file2,allowed_diff_count,diff_lines)) if diff_lines > allowed_diff_count: diff_slice = diff[0:40] #FIXME: This pdf stuff is rather special cased and has not been updated to consider lines_diff @@ -78,6 +77,7 @@ # not differ we're ok. valid_diff_strs = [ 'description', 'createdate', 'creationdate', 'moddate', 'id', 'producer', 'creator', 'extgstate', 'ais' ] valid_diff = False + invalid_diff_lines = 0 for line in diff_slice: # Make sure to lower case strings before checking. line = line.lower() @@ -91,10 +91,14 @@ # Stop checking as soon as we know we have a valid difference break if not valid_diff: - # Print out diff_slice so we can see what failed - print "###### diff_slice ######" - raise AssertionError( "".join( diff_slice ) ) + invalid_diff_lines += 1 + log.info('## files diff on %s and %s lines_diff=%d, found diff = %d, found pdf invalid diff = %d' % (file1,file2,allowed_diff_count,diff_lines,invalid_diff_lines)) + if invalid_diff_lines > allowed_diff_count: + # Print out diff_slice so we can see what failed + print "###### diff_slice ######" + raise AssertionError( "".join( diff_slice ) ) else: + log.info('## files diff on %s and %s lines_diff=%d, found diff = %d' % (file1,file2,allowed_diff_count,diff_lines)) for line in diff_slice: for char in line: if ord( char ) > 128: http://bitbucket.org/galaxy/galaxy-central/changeset/a184ad71d151/ changeset: r5168:a184ad71d151 user: natefoo date: 2011-03-03 18:21:44 summary: Use lines_diff on the pdf outputs of various R-based tools. affected #: 5 files (105 bytes) --- a/tools/multivariate_stats/cca.xml Thu Mar 03 12:21:22 2011 -0500 +++ b/tools/multivariate_stats/cca.xml Thu Mar 03 12:21:44 2011 -0500 @@ -52,7 +52,7 @@ <param name="y_scale" value="scale"/><param name="std_scores" value="yes"/><output name="out_file1" file="cca_out1.tabular"/> - <output name="out_file2" file="cca_out2.pdf"/> + <output name="out_file2" file="cca_out2.pdf" lines_diff="6"/></test></tests><help> --- a/tools/multivariate_stats/kpca.xml Thu Mar 03 12:21:22 2011 -0500 +++ b/tools/multivariate_stats/kpca.xml Thu Mar 03 12:21:44 2011 -0500 @@ -108,7 +108,7 @@ <param name="scale" value="1"/><param name="degree" value="2"/><output name="out_file1" file="kpca_out1.tabular"/> - <output name="out_file2" file="kpca_out2.pdf"/> + <output name="out_file2" file="kpca_out2.pdf" lines_diff="6"/></test></tests><help> --- a/tools/multivariate_stats/pca.xml Thu Mar 03 12:21:22 2011 -0500 +++ b/tools/multivariate_stats/pca.xml Thu Mar 03 12:21:44 2011 -0500 @@ -47,14 +47,14 @@ <param name="var_cols" value="1,2,3,4"/><param name="method" value="cor"/><output name="out_file1" file="pca_out1.tabular"/> - <output name="out_file2" file="pca_out2.pdf"/> + <output name="out_file2" file="pca_out2.pdf" lines_diff="6"/></test><test><param name="input1" value="iris.tabular"/><param name="var_cols" value="1,2,3,4"/><param name="method" value="cov"/><output name="out_file1" file="pca_out3.tabular"/> - <output name="out_file2" file="pca_out4.pdf"/> + <output name="out_file2" file="pca_out4.pdf" lines_diff="6"/></test><test><param name="input1" value="iris.tabular"/> @@ -62,7 +62,7 @@ <param name="method" value="svd"/><param name="scale" value="both"/><output name="out_file1" file="pca_out5.tabular"/> - <output name="out_file2" file="pca_out6.pdf"/> + <output name="out_file2" file="pca_out6.pdf" lines_diff="6"/></test></tests><help> --- a/tools/plotting/histogram2.xml Thu Mar 03 12:21:22 2011 -0500 +++ b/tools/plotting/histogram2.xml Thu Mar 03 12:21:44 2011 -0500 @@ -22,7 +22,7 @@ <param name="xlab" value="V1"/><param name="density" value="true"/><param name="frequency" value="false"/> - <output name="out_file1" file="histogram_out1.pdf" /> + <output name="out_file1" file="histogram_out1.pdf" lines_diff="6" /></test></tests><requirements> --- a/tools/regVariation/linear_regression.xml Thu Mar 03 12:21:22 2011 -0500 +++ b/tools/regVariation/linear_regression.xml Thu Mar 03 12:21:44 2011 -0500 @@ -29,7 +29,7 @@ <param name="response_col" value="3"/><param name="predictor_cols" value="1,2"/><output name="out_file1" file="regr_out.tabular"/> - <output name="out_file2" file="regr_out.pdf"/> + <output name="out_file2" file="regr_out.pdf" lines_diff="6"/></test></tests><help> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.