When getting CC list during test import, ignore non-email-addresses.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
  4. Commit the CL.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, trigger try jobs, and make any changes that are required for
 new failing tests before committing.
 """
 
-import logging
 import argparse
 import json
+import logging
+import re
 
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
 from webkitpy.w3c.test_importer import TestImporter
 from webkitpy.w3c.common import WPT_REPO_URL, CSS_REPO_URL, WPT_DEST_NAME, CSS_DEST_NAME
 
 # Settings for how often to check try job results and how long to wait.
 POLL_DELAY_SECONDS = 2 * 60
 TIMEOUT_SECONDS = 180 * 60
@@ skipping 351 matching lines @@
         Returns:
             A list of the email addresses to be notified for the current import.
         """
         email_addresses = set()
         for file_path in changed_files:
             test_path = self.finder.layout_test_name(file_path)
             if test_path is None:
                 continue
             test_dir = self.fs.dirname(test_path)
             if test_dir in directory_to_owner:
-                email_addresses.add(directory_to_owner[test_dir])
+                address = directory_to_owner[test_dir]
+                if not re.match(r'\S+@\S+', address):

[jeffcarp, 2017/01/23 20:28:34]

I read somewhere that '@' isn't necessarily required in an email address, but
after trying to cite my source for 15 minutes, I couldn't find it. (And of
course, I think this regex is totally fine for the job at hand.)

+                    _log.warning('%s appears not be an email address, skipping.', address)
+                    continue
+                email_addresses.add(address)
         return sorted(email_addresses)
 
     def fetch_new_expectations_and_baselines(self):
         """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
         _log.info('Adding test expectations lines to LayoutTests/TestExpectations.')
         script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c-test-expectations')
         self.run([self.host.executable, script_path, '--verbose'])
         message = 'Modify TestExpectations or download new baselines for tests.'
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl.run(['upload', '-m', message, '--rietveld'])
@@ skipping 42 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests