[polymer] Merge of master into polymer10-migration

telemetry/telemetry/wpr/archive_info_unittest.py

Index: telemetry/telemetry/wpr/archive_info_unittest.py
diff --git a/telemetry/telemetry/wpr/archive_info_unittest.py b/telemetry/telemetry/wpr/archive_info_unittest.py
index b082aa9ea0365b6f7a6f344c28a37f083bb66bc0..5f9a5f2aaabeb732bbe72a656d9b485b88af4959 100644
--- a/telemetry/telemetry/wpr/archive_info_unittest.py
+++ b/telemetry/telemetry/wpr/archive_info_unittest.py
@@ -122,6 +122,11 @@ class WprArchiveInfoTest(unittest.TestCase):
       archive_file_contents = json.load(f)
       self.assertEquals(expected_archive_file_contents, archive_file_contents)
 
+    # Nit: Ensure the saved json does not contian trailing spaces.
+    with open(self.story_set_archive_info_file, 'rU') as f:
+      for line in f:
+        self.assertFalse(line.rstrip('\n').endswith(' '))
+
   def testModifications(self):
     recording1_path = os.path.join(self.tmp_dir, recording1)
     recording2_path = os.path.join(self.tmp_dir, recording2)