summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2011-11-24 04:40:06 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2011-11-24 04:40:06 (GMT)
commitc2fb5d3650ffaa42c68e02891168c711d3b5f079 (patch)
treee1e10e8fc59b65d17af2d6c7f170752032bd469f
parent062244a3b15356defac5d3eee969e330a9447781 (diff)
fix pretty printer
-rwxr-xr-xtests/test_pretty_print.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py
index 97e99d5..fb88c2f 100755
--- a/tests/test_pretty_print.py
+++ b/tests/test_pretty_print.py
@@ -295,7 +295,7 @@ def upload(wikiurl,api_php_path,wikidata,manifest,wiki_rootpath,sysid,botname,bo
if 'expected.png' in wikifile.lower():
image = site.Images[wikifile]
if image.exists and forceupload==False:
- print 'skipping ',wikifile, '(image with same name and size ',localsize,'already on wiki)'
+ print 'skipping',wikifile, '(already on wiki)'
skip=True
if not skip:
print 'uploading',wikifile,'...'
@@ -312,13 +312,13 @@ def main():
startdate, tests, enddate = parselog(testlog)
tests = sorted(tests, key = lambda t:t.passed)
sysinfo, sysid = read_sysinfo('sysinfo.txt')
- if '--forceupload' in sys.argv: forceupload=True
- else: forceupload=False
- manifest, wikidata = towiki(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, testlog, forceupload)
+ if '--forceupload' in sys.argv: forceupl=True
+ else: forceupl=False
+ manifest, wikidata = towiki(wiki_rootpath, startdate, tests, enddate, sysinfo, sysid, testlog)
trysave(wikidata, os.path.join(logpath,sysid+'.wiki'))
htmldata = wikitohtml(wiki_rootpath, sysid, wikidata, manifest)
trysave(htmldata, os.path.join(logpath,sysid+'.html'))
if '--upload' in sys.argv:
- upload(wikisite,'',wikidata,manifest,wiki_rootpath,sysid,'openscadbot','tobdacsnepo',dryrun=False)
+ upload(wikisite,'',wikidata,manifest,wiki_rootpath,sysid,'openscadbot','tobdacsnepo',dryrun=False,forceupload=forceupl)
main()
contact: Jan Huwald // Impressum