Revert of skpmaker: make the SKP slightly more interesting (add a border)

tools/tests/render_pictures_test.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Test the render_pictures binary.
 """
@@ skipping 22 matching lines @@
     output_json_path = os.path.join(self._temp_dir, 'output.json')
     self._run_skpmaker(['--writePath', input_skp_path])
     self._run_render_pictures(['-r', input_skp_path,
                                '--bbh', 'grid', '256', '256',
                                '--mode', 'tile', '256', '256',
                                '--writeJsonSummaryPath', output_json_path,
                                '--writeWholeImage'])
     expected_summary_dict = {
         "actual-results" : {
             "no-comparison" : {
-                # Manually verified: 640x400 red image with black border
-                "input.png" : [ "bitmap-64bitMD5", 11092453015575919668 ]
+                "input.png" : [ "bitmap-64bitMD5", 12793741875005523433 ]
+                }
             }
         }
-    }
     self._assert_json_contents(output_json_path, expected_summary_dict)
 
   def test_tiled_no_comparison(self):
     """Generate individual tiles.
 
     TODO(epoger): The results of this test are currently broken!
     The summary should contain a list of tiles, but for some reason, it is
     empty."""
     input_skp_path = os.path.join(self._temp_dir, 'input.skp')
     output_json_path = os.path.join(self._temp_dir, 'output.json')
@@ skipping 61 matching lines @@
     actual_dict = json.loads(file_contents)
     self.assertEqual(actual_dict, expected_dict)
 
 
 def main():
   base_unittest.main(RenderPicturesTest)
 
 
 if __name__ == '__main__':
   main()