Simplify import-w3c-tests: support exactly one argument.

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

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 111 matching lines @@
 
     logger = logging.getLogger()
     logger.setLevel(logging.INFO)
     handler = LogHandler()
     handler.setLevel(logging.INFO)
     logger.addHandler(handler)
     return handler
 
 
 def parse_args():
-    parser = optparse.OptionParser(usage='usage: %prog [options] [dir_to_import] [top_of_repo]')
+    parser = optparse.OptionParser(usage='usage: %prog [options] [dir_to_import] top_of_repo')
     parser.add_option('-n', '--no-overwrite', dest='overwrite', action='store_false', default=True,
                       help='Flag to prevent duplicate test files from overwriting existing tests. By default, they will be overwritten.')
     parser.add_option('-a', '--all', action='store_true', default=False,
                       help='Import all tests including reftests, JS tests, and manual/pixel tests. By default, only reftests and JS tests are imported.')
     parser.add_option('-d', '--dest-dir', dest='destination', default='w3c',
                       help='Import into a specified directory relative to the LayoutTests root. By default, files are imported under LayoutTests/w3c.')
     parser.add_option('--ignore-expectations', action='store_true', default=False,
                       help='Ignore the W3CImportExpectations file and import everything.')
     parser.add_option('--dry-run', action='store_true', default=False,
                       help='Dryrun only (don\'t actually write any results).')
 
     options, args = parser.parse_args()
-    if len(args) > 2:
+    if len(args) > 2 or len(args) == 0:

[Dirk Pranke, 2016/05/23 20:28:24]

In what situation these days do we actually specify either 1 or 2 args? Can we
just settle on one variant and not support both?

         parser.error('Incorrect number of arguments')
-    elif len(args) == 0:
-        # If no top-of-repo path was given, then assume that the user means to
-        # use the current working directory as the top-of-repo path.
-        # TODO(qyearsley): Remove this behavior, since it's a little confusing.
-        args = (os.getcwd(),)
     return options, args
 
 
 class TestImporter(object):
 
     def __init__(self, host, dir_to_import, top_of_repo, options):
         self.host = host
         self.dir_to_import = dir_to_import
         self.top_of_repo = top_of_repo
         self.options = options
@@ skipping 250 matching lines @@
         """ Creates a destination directory that mirrors that of the source directory """
 
         new_subpath = self.dir_to_import[len(self.top_of_repo):]
 
         destination_directory = self.filesystem.join(self.destination_directory, new_subpath)
 
         if not self.filesystem.exists(destination_directory):
             self.filesystem.maybe_make_directory(destination_directory)
 
         _log.info('Tests will be imported into: %s', destination_directory)