[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30331] branches/soc-2010-leifandersen/ tests/render/run.py: 1.

Leif Andersen leif.a.andersen at gmail.com
Wed Jul 14 19:22:36 CEST 2010


Revision: 30331
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30331
Author:   leifandersen
Date:     2010-07-14 19:22:36 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
1.  Fixed a major bug causing all animation tests to crash that cropped up in thee refactoring.

2.  Changed the outputted HTML to make it cleaner.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/tests/render/run.py

Modified: branches/soc-2010-leifandersen/tests/render/run.py
===================================================================
--- branches/soc-2010-leifandersen/tests/render/run.py	2010-07-14 16:41:44 UTC (rev 30330)
+++ branches/soc-2010-leifandersen/tests/render/run.py	2010-07-14 17:22:36 UTC (rev 30331)
@@ -316,7 +316,7 @@
             self.bad_pixels = self.bad_pixels_arr[0]
             self.pixel_range = self.pixel_range_arr[0]
             self.pixel_count = 0
-            for num in self.pixel_count:
+            for num in self.pixel_count_arr:
                 self.pixel_count+=num
             
             self.passed = True
@@ -454,7 +454,7 @@
             print test_case.name
     else:
         print "All tests passed"
-    if len(failed) == len(cases):
+    if len(failed) == len(cases) and len(cases) != 0:
         print ''
         print "It is possible that the tests have not been built, if so"
         print "Please build tests by running: python run.py --build-tests"
@@ -557,8 +557,7 @@
     file.write('<div class="document">\n')
     file.write('<div id="pageheader"></div>\n')
     file.write('<div class="documentwrapper">\n<div class="bodywrapper">\n<div class="body">\n')
-    file.write('<h1>Images</h1>\n')
-    file.write('<h2>Failed Images</h2>\n')
+    file.write('<h1>Animation:' + animation.name + '</h1>\n')
     file.write('<table border="1">\n')
     file.write('<tr>\n')
     file.write('<th>Filename</th>\n')
@@ -571,7 +570,7 @@
     i = 1
     for frame in animation.diff_animation:
         file.write('<tr>\n')
-        file.write('<td>' +  animation.name + str(i) +  '</td>\n')
+        file.write('<td> Frame: ' + str(i) +  '</td>\n')
         file.write('<td><a href="' + animation.good_path_arr[i-1] + '"><img src="' + animation.good_path_arr[i-1] + '" alt="Good Image" width="200" height="150"></a></td>\n')
         file.write('<td><a href="' + animation.test_path_arr[i-1] + '"><img src="' + animation.test_path_arr[i-1] + '" alt="Latest Render" width="200" height="150"></a></td>\n')
         file.write('<td><a href="' + animation.diff_path_arr[i-1] + '"><img src="' + animation.diff_path_arr[i-1] + '" alt="Image Diff" width="200" height="150"></a></td>\n')
@@ -633,7 +632,7 @@
         GOOD_FOLDER = ''
         ANIM_OUTPUT_FOLDER = ANIM_GOOD_FOLDER
         ANIM_GOOD_FOLDER = ''
-        
+
     for arg in args:
         (directory, file) = os.path.split(arg)
         if options.image:





More information about the Bf-blender-cvs mailing list