gclient: Don't allow URL to be None.

Bug: 839925
Change-Id: I5a559db846ac19e3c61e77f3019c7d5362beccba
Reviewed-on: https://chromium-review.googlesource.com/1063029Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

tests/gclient_smoketest.py

@@ -246,9 +246,14 @@ class GClientSmoke(GClientSmokeBase):
           ']\n'
           'cache_dir = None\n') % self.git_base)
 
-    test(['config', '--spec', '["blah blah"]'], '["blah blah"]')
-
     os.remove(p)
+    results = self.gclient(['config', '--spec', '["blah blah"]'])
+    self.assertEqual(('', 'Error: No solution specified\n', 1), results)
+
+    results = self.gclient(['config', '--spec',
+                            'solutions=[{"name": "./", "url": None}]'])
+    self.assertEqual(('', 'Error: No solution specified\n', 1), results)
+
     results = self.gclient(['config', 'foo', 'faa', 'fuu'])
     err = ('Usage: gclient.py config [options] [url]\n\n'
            'gclient.py: error: Inconsistent arguments. Use either --spec or one'
@@ -256,24 +261,6 @@ class GClientSmoke(GClientSmokeBase):
     self.check(('', err, 2), results)
     self.assertFalse(os.path.exists(join(self.root_dir, '.gclient')))
 
-  def testSolutionNone(self):
-    results = self.gclient(['config', '--spec',
-                            'solutions=[{"name": "./", "url": None}]'])
-    self.check(('', '', 0), results)
-    results = self.gclient(['sync'])
-    self.check(('', '', 0), results)
-    self.assertTree({})
-    results = self.gclient(['revinfo'])
-    self.check(('./: None\n', '', 0), results)
-    self.check(('', '', 0), self.gclient(['diff']))
-    self.assertTree({})
-    self.check(('', '', 0), self.gclient(['pack']))
-    self.check(('', '', 0), self.gclient(['revert']))
-    self.assertTree({})
-    self.check(('', '', 0), self.gclient(['runhooks']))
-    self.assertTree({})
-    self.check(('', '', 0), self.gclient(['status']))
-
   def testDifferentTopLevelDirectory(self):
     # Check that even if the .gclient file does not mention the directory src
     # itself, but it is included via dependencies, the .gclient file is used.

tests/gclient_test.py

@@ -202,7 +202,7 @@ class GclientTest(trial_dir.TestCase):
     url = 'proto://host/path/@revision'
     d = gclient.Dependency(
         None, 'name', url, url, None, None, None,
-        None, '', True, False, None, True)
+        None, '', False, None, True)
     self.assertEquals('proto://host/path@revision', d.url)
 
   def testStr(self):
@@ -213,17 +213,17 @@ class GclientTest(trial_dir.TestCase):
       [
         gclient.Dependency(
             obj, 'foo', 'svn://example.com/foo', 'svn://example.com/foo', None,
-            None, None, None, 'DEPS', True, False, None, True),
+            None, None, None, 'DEPS', False, None, True),
         gclient.Dependency(
             obj, 'bar', 'svn://example.com/bar', 'svn://example.com/bar', None,
-            None, None, None, 'DEPS', True, False, None, True),
+            None, None, None, 'DEPS', False, None, True),
       ],
       [])
     obj.dependencies[0].add_dependencies_and_close(
       [
         gclient.Dependency(
             obj.dependencies[0], 'foo/dir1', 'svn://example.com/foo/dir1',
-            'svn://example.com/foo/dir1', None, None, None, None, 'DEPS', True,
+            'svn://example.com/foo/dir1', None, None, None, None, 'DEPS',
             False, None, True),
       ],
       [])
@@ -232,7 +232,7 @@ class GclientTest(trial_dir.TestCase):
     # pylint: disable=protected-access
     obj.dependencies[0]._file_list.append('foo')
     str_obj = str(obj)
-    self.assertEquals(322, len(str_obj), '%d\n%s' % (len(str_obj), str_obj))
+    self.assertEquals(230, len(str_obj), '%d\n%s' % (len(str_obj), str_obj))
 
   def testHooks(self):
     topdir = self.root_dir
@@ -543,14 +543,12 @@ class GclientTest(trial_dir.TestCase):
         ('foo/rel', 'svn://example.com/rel'),
     ], self._get_processed())
 
-    self.assertEqual(6, len(sol.dependencies))
+    self.assertEqual(4, len(sol.dependencies))
     self.assertEqual([
         ('foo/bar', 'svn://example.com/override'),
         ('foo/baz', 'svn://example.com/baz'),
         ('foo/new', 'svn://example.com/new'),
         ('foo/rel', 'svn://example.com/rel'),
-        ('foo/skip', None),
-        ('foo/skip2', None),
     ], [(dep.name, dep.url) for dep in sol.dependencies])
 
   def testDepsOsOverrideDepsInDepsFile(self):
@@ -1131,8 +1129,7 @@ class GclientTest(trial_dir.TestCase):
       [
         gclient.Dependency(
             obj, 'foo', 'svn://example.com/foo', 'svn://example.com/foo', None,
-            None, None, None, 'DEPS', True,
-            False, None, True),
+            None, None, None, 'DEPS', False, None, True),
       ],
       [])
     obj.dependencies[0].add_dependencies_and_close(
@@ -1140,12 +1137,12 @@ class GclientTest(trial_dir.TestCase):
         gclient.CipdDependency(obj.dependencies[0], 'foo',
                                {'package': 'foo_package',
                                 'version': 'foo_version'},
-                               cipd_root, None, True, False,
+                               cipd_root, None, False,
                                'fake_condition'),
         gclient.CipdDependency(obj.dependencies[0], 'foo',
                                {'package': 'bar_package',
                                 'version': 'bar_version'},
-                               cipd_root, None, True, False,
+                               cipd_root, None, False,
                                'fake_condition'),
       ],
       [])