Fixes Caterpillar crashing while generating report.

src/end_to_end_test.py

 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 
 # Copyright 2016 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 62 matching lines @@
         [CATERPILLAR_PATH, 'convert', '-c', self.config_path, self.input_dir,
          self.output_dir],
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT)
     process.wait()
 
   def test_output_matches_reference(self):
     """Tests that the output matches the reference output."""
     expected_files = set()
     for dirname, _, filenames in os.walk(TTS_REFERENCE_PATH):

[Matt Giuca, 2016/02/04 05:10:31]

This has almost the same thing four times. I think it could be abstracted.

Why might bower_components be in a directory and not match?

[Matthew Alger, 2016/02/04 05:44:01]

Done.

We ignore bower_components because it is where we store report dependencies, and
I don't want to check those.

+      if 'bower_components' in dirname:
+        continue
+
       for filename in filenames:
         relpath = os.path.relpath(
             os.path.join(dirname, filename), TTS_REFERENCE_PATH)
         expected_files.add(relpath)
 
     for dirname, _, filenames in os.walk(self.output_dir):
+      if 'bower_components' in dirname:
+        continue
+
       for filename in filenames:
         relpath = os.path.relpath(
             os.path.join(dirname, filename), self.output_dir)
         self.assertIn(relpath, expected_files)
 
     expected_files = set()
     for dirname, _, filenames in os.walk(self.output_dir):
+      if 'bower_components' in dirname:
+        continue
+
       for filename in filenames:
         relpath = os.path.relpath(
             os.path.join(dirname, filename), self.output_dir)
         expected_files.add(relpath)
 
     for dirname, _, filenames in os.walk(TTS_REFERENCE_PATH):
+      if 'bower_components' in dirname:
+        continue
+
       for filename in filenames:
         relpath = os.path.relpath(
             os.path.join(dirname, filename), TTS_REFERENCE_PATH)
         self.assertIn(relpath, expected_files)
 
   def test_all_correct_contents(self):
     """Tests that the content of all non-static output files is expected."""
     for dirname, _, filenames in os.walk(TTS_REFERENCE_PATH):
       for filename in filenames:
         if filename == caterpillar.SW_SCRIPT_NAME:
@@ skipping 42 matching lines @@
                 '\n'.join(difflib.unified_diff(
                     output_data.split('\n'),
                     reference_data.split('\n'),
                     fromfile=reference_sw_path,
                     tofile=output_sw_path,
                     n=0))))
 
 
 if __name__ == '__main__':
   unittest.main()