Revert "If managed=False, don't fetch."

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 1395 matching lines @@
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
 
     scm = gclient_scm.CreateSCM(url=origin_root_dir,
                                 root_dir=self.root_dir,
                                 relpath=self.relpath)
 
+    expected_file_list = [join(self.base_path, "a"),
+                          join(self.base_path, "b")]
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
 
-    self.assertEquals(file_list, [])
-    self.assertRaises(subprocess2.CalledProcessError,
-                      scm.revinfo, options, (), None)
-
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
+                      '069c602044c5388d2d15c3f875b057c852003458')
     # indicates detached HEAD
-    self.assertRaises(subprocess2.CalledProcessError, self.getCurrentBranch)
-    self.checkInStdout('unmanaged solution; skipping')
+    self.assertEquals(self.getCurrentBranch(), None)
+    self.checkInStdout(
+      'Checked out refs/remotes/origin/master to a detached HEAD')
 
     rmtree(origin_root_dir)
 
   def testUpdateCloneOnCommit(self):
     if not self.enabled:
       return
     options = self.Options()
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     url_with_commit_ref = origin_root_dir +\
                           '@a7142dc9f0009350b96a11f372b6ea658592aa95'
 
     scm = gclient_scm.CreateSCM(url=url_with_commit_ref,
                                 root_dir=self.root_dir,
                                 relpath=self.relpath)
 
+    expected_file_list = [join(self.base_path, "a"),
+                          join(self.base_path, "b")]
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
 
-    self.assertEquals(file_list, [])
-    self.assertRaises(subprocess2.CalledProcessError,
-                      scm.revinfo, options, (), None)
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
+                      'a7142dc9f0009350b96a11f372b6ea658592aa95')
     # indicates detached HEAD
-    self.assertRaises(subprocess2.CalledProcessError, self.getCurrentBranch)
-    self.checkInStdout('unmanaged solution; skipping')
+    self.assertEquals(self.getCurrentBranch(), None)
+    self.checkInStdout(
+      'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD')
 
     rmtree(origin_root_dir)
 
   def testUpdateCloneOnBranch(self):
     if not self.enabled:
       return
     options = self.Options()
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     url_with_branch_ref = origin_root_dir + '@feature'
 
     scm = gclient_scm.CreateSCM(url=url_with_branch_ref,
                                 root_dir=self.root_dir,
                                 relpath=self.relpath)
 
+    expected_file_list = [join(self.base_path, "a"),
+                          join(self.base_path, "b"),
+                          join(self.base_path, "c")]
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
 
-    self.assertEquals(file_list, [])
-    self.assertRaises(subprocess2.CalledProcessError,
-                      scm.revinfo, options, (), None)
-    self.assertRaises(subprocess2.CalledProcessError, self.getCurrentBranch)
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
+                      '9a51244740b25fa2ded5252ca00a3178d3f665a9')
+    self.assertEquals(self.getCurrentBranch(), 'feature')
     self.checkNotInStdout('Checked out feature to a detached HEAD')
 
     rmtree(origin_root_dir)
 
   def testUpdateCloneOnDetachedBranch(self):
     if not self.enabled:
       return
     options = self.Options()
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature'
 
     scm = gclient_scm.CreateSCM(url=url_with_branch_ref,
                                 root_dir=self.root_dir,
                                 relpath=self.relpath)
 
+    expected_file_list = [join(self.base_path, "a"),
+                          join(self.base_path, "b"),
+                          join(self.base_path, "c")]
     file_list = []
     options.revision = 'unmanaged'
-    scm.update(options, (), [])
+    scm.update(options, (), file_list)
 
-    self.assertEquals(file_list, [])
-    self.assertRaises(subprocess2.CalledProcessError,
-                      scm.revinfo, options, (), None)
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
+                      '9a51244740b25fa2ded5252ca00a3178d3f665a9')
     # indicates detached HEAD
-    self.assertRaises(subprocess2.CalledProcessError, self.getCurrentBranch)
-    self.checkInStdout('unmanaged solution; skipping')
+    self.assertEquals(self.getCurrentBranch(), None)
+    self.checkInStdout(
+      'Checked out refs/remotes/origin/feature to a detached HEAD')
 
     rmtree(origin_root_dir)
 
   def testUpdateCloneOnBranchHead(self):
     if not self.enabled:
       return
     options = self.Options()
 
     origin_root_dir = self.root_dir
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = join(self.root_dir, self.relpath)
     url_with_branch_ref = origin_root_dir + '@refs/heads/feature'
 
     scm = gclient_scm.CreateSCM(url=url_with_branch_ref,
                                 root_dir=self.root_dir,
                                 relpath=self.relpath)
 
+    expected_file_list = [join(self.base_path, "a"),
+                          join(self.base_path, "b"),
+                          join(self.base_path, "c")]
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
 
-    self.assertEquals(file_list, [])
-    self.assertRaises(subprocess2.CalledProcessError,
-                      scm.revinfo, options, (), None)
-    self.assertRaises(subprocess2.CalledProcessError, self.getCurrentBranch)
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
+                      '9a51244740b25fa2ded5252ca00a3178d3f665a9')
+    self.assertEquals(self.getCurrentBranch(), 'feature')
     self.checkNotInStdout(
       'Checked out refs/heads/feature to a detached HEAD')
 
     rmtree(origin_root_dir)
 
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = []
@@ skipping 10 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: