Revert of [package.proto] convert deps from list to map.

unittests/package_test.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import copy
 import doctest
 import os
 import subprocess
 import unittest
 
 import repo_test_util
 
 import mock
+from recipe_engine import package
 
-from recipe_engine import fetch
-from recipe_engine import package
 
 TEST_AUTHOR = 'foo@example.com'
 
 
 class MockIOThings(object):
   def setUp(self):
     super(MockIOThings, self).setUp()
 
     self.mock_os_patcher = mock.patch('recipe_engine.package.os')
     self.mock_os = self.mock_os_patcher.start()
@@ skipping 348 matching lines @@
   def write(self, buf):
     pass
 
 
 class TestPackageSpec(MockIOThings, unittest.TestCase):
   def setUp(self):
     super(TestPackageSpec, self).setUp()
 
     self.proto_text = '\n'.join([
       '{',
-      '  "api_version": 2,',
-      '  "deps": {',
-      '    "bar": {',
-      '      "branch": "superbar",',
-      '      "revision": "deadd00d",',
-      '      "url": "https://repo.com/bar.git"',
-      '    },',
-      '    "foo": {',
-      '      "branch": "master",',
-      '      "revision": "cafebeef",',
-      '      "url": "https://repo.com/foo.git"',
-      '    }',
-      '  },',
-      '  "project_id": "super_main_package",',
-      '  "recipes_path": "path/to/recipes"',
-      '}',
-    ])
-    self.proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg',
-                                    self.proto_text)
-    self.context = package.PackageContext.from_proto_file(
-        'repo/root', self.proto_file, allow_fetch=False)
-
-  def test_dump_load_inverses(self):
-    # Doubles as a test for equality reflexivity.
-    package_spec = package.PackageSpec.load_proto(self.proto_file)
-    self.assertEqual(self.proto_file.to_raw(package_spec.dump()),
-                     self.proto_text)
-    self.assertEqual(package.PackageSpec.load_proto(self.proto_file),
-                     package_spec)
-
-  def test_dump_round_trips(self):
-    proto_text = """
-{"api_version": 1}
-""".lstrip()
-    proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg', proto_text)
-    package_spec = package.PackageSpec.load_proto(proto_file)
-    self.assertEqual(proto_file.to_raw(package_spec.dump()),
-                     '{\n  "api_version": 1\n}')
-
-  def test_no_version(self):
-    proto_text = """{
-  "project_id": "foo",
-  "recipes_path": "path/to/recipes"
-}
-"""
-    proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg', proto_text)
-
-    with self.assertRaises(AssertionError):
-      package.PackageSpec.load_proto(proto_file)
-
-  def test_old_deps(self):
-    proto_text = '\n'.join([
-      '{',
       '  "api_version": 1,',
       '  "deps": [',
       '    {',
       '      "branch": "superbar",',
       '      "project_id": "bar",',
       '      "revision": "deadd00d",',
       '      "url": "https://repo.com/bar.git"',
       '    },',
       '    {',
       '      "branch": "master",',
       '      "project_id": "foo",',
       '      "revision": "cafebeef",',
       '      "url": "https://repo.com/foo.git"',
       '    }',
       '  ],',
       '  "project_id": "super_main_package",',
       '  "recipes_path": "path/to/recipes"',
       '}',
     ])
+    self.proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg',
+                                    self.proto_text)
+    self.context = package.PackageContext.from_proto_file(
+        'repo/root', self.proto_file, allow_fetch=False)
+
+  def test_dump_load_inverses(self):
+    # Doubles as a test for equality reflexivity.
+    package_spec = package.PackageSpec.load_proto(self.proto_file)
+    self.assertEqual(self.proto_file.to_raw(package_spec.dump()),
+                     self.proto_text)
+    self.assertEqual(package.PackageSpec.load_proto(self.proto_file),
+                     package_spec)
+
+  def test_dump_round_trips(self):
+    proto_text = """
+{"api_version": 1}
+""".lstrip()
+    proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg', proto_text)
+    package_spec = package.PackageSpec.load_proto(proto_file)
+    self.assertEqual(proto_file.to_raw(package_spec.dump()),
+                     '{\n  "api_version": 1\n}')
+
+  def test_no_version(self):
+    proto_text = """{
+  "project_id": "foo",
+  "recipes_path": "path/to/recipes"
+}
+"""
     proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg', proto_text)
 
-    spec = package.PackageSpec.load_proto(proto_file)
-    self.assertEqual(spec.deps['foo'], package.GitRepoSpec(
-      'foo',
-      'https://repo.com/foo.git',
-      'master',
-      'cafebeef',
-      '',
-      fetch.GitBackend()
-    ))
-    self.assertEqual(proto_file.to_raw(spec.dump()), proto_text)
-
+    with self.assertRaises(AssertionError):
+      package.PackageSpec.load_proto(proto_file)
 
   def test_unsupported_version(self):
     proto_text = """{
   "api_version": 99999999,
   "project_id": "fizzbar",
   "recipes_path": "path/to/recipes"
 }"""
     proto_file = MockProtoFile('repo/root/infra/config/recipes.cfg', proto_text)
 
     with self.assertRaises(AssertionError):
@@ skipping 41 matching lines @@
       self.assertFalse(checkout.called)
 
 
 def load_tests(_loader, tests, _ignore):
   tests.addTests(doctest.DocTestSuite(package))
   return tests
 
 
 if __name__ == '__main__':
   result = unittest.main()