[update-checkout] Fix --dump-hashes for my changes around adding support for specifying the source root from update-checkout itself.

With a test to make sure I don't break it again!

Author: gottesmm

utils/update_checkout/tests/scheme_mock.py

@@ -36,6 +36,10 @@
 }
 
 MOCK_CONFIG = {
+    # This is here just b/c we expect it. We should consider consolidating
+    # clone-patterns into a dictionary where we map protocols (i.e. ['ssh,
+    # 'https'] to patterns). Then we can define this issue.
+    'ssh-clone-pattern': 'DO_NOT_USE',
     # We reset this value with our remote path when we process
     'https-clone-pattern': '',
     'repos': {

utils/update_checkout/tests/test_dump.py

@@ -0,0 +1,33 @@
+# ===--- test_dump.py -----------------------------------------------------===#
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https:#swift.org/LICENSE.txt for license information
+# See https:#swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ===----------------------------------------------------------------------===#
+
+import scheme_mock
+
+
+class DumpTestCase(scheme_mock.SchemeMockTestCase):
+
+    def __init__(self, *args, **kwargs):
+        super(DumpTestCase, self).__init__(*args, **kwargs)
+
+    def test_dump_hashes_json(self):
+        # First do the clone.
+        self.call([self.update_checkout_path,
+                   '--config', self.config_path,
+                   '--source-root', self.source_root,
+                   '--clone'])
+
+        # Then dump the hashes. Just make sure we don't crash. We should test
+        # the output as well. But we should never crash.
+        self.call([self.update_checkout_path,
+                   '--config', self.config_path,
+                   '--source-root', self.source_root,
+                   '--dump-hashes'])

utils/update_checkout/update_checkout/update_checkout.py

@@ -514,7 +514,7 @@ def main():
     validate_config(config)
 
     if args.dump_hashes:
-        dump_repo_hashes(config)
+        dump_repo_hashes(args, config)
         return (None, None)
 
     if args.dump_hashes_config: