Reapply gclient.py refactor for the third time.

tests/gclient_smoketest.py

Index: tests/gclient_smoketest.py
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index afd440aba32a1ee0f31f26eeaf7fafaf47235af8..feaa3158db1ac52f0863c1f64c9d43d887659be5 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -602,7 +602,6 @@ class GClientSmokeGIT(GClientSmokeBase):
   def testRevInfo(self):
     if not self.enabled:
       return
-    # TODO(maruel): Test multiple solutions.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
@@ -641,7 +640,7 @@ class GClientSmokeBoth(GClientSmokeBase):
                      # file when File() is used in a DEPS file.
                      ('running', self.root_dir + '/src/file/other'),
                      'running', 'running', 'running', 'running', 'running',
-                     'running', 'running'])
+                     'running'])
     # TODO(maruel): Something's wrong here. git outputs to stderr 'Switched to
     # new branch \'hash\''.
     #self.checkString('', results[1])
@@ -658,7 +657,6 @@ class GClientSmokeBoth(GClientSmokeBase):
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
-    tree['src/svn_hooked2'] = 'svn_hooked2'
     self.assertTree(tree)
 
   def testMultiSolutionsMultiRev(self):