Refactor infra git libs and testing.

infra/libs/git2/test/config_ref_test.py

 # Copyright 2014 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.
 
-from infra.services.gnumbd.support import config_ref, git
-from infra.services.gnumbd.test import git_test
+from infra.libs import git2
 

[agable, 2014/06/27 18:53:12]

nit: no newlines

I thought our policy was:
* builtin imports
* from builtin imports
* local imports
* from local imports

All of these are local package imports; no need for newlines between them.

-class TestConfigRef(git_test.TestBasis):
+from infra.libs.git2 import config_ref
+
+from infra.libs.git2.test import git2_test
+

[agable, 2014/06/27 18:53:12]

nit: two newlines

Also I'm not gonna comment on every instance of this from here on out :P

+class TestConfigRef(git2_test.TestBasis):
   def writeConfig(self, config_data):
     ref = 'refs/metaconfig'
     def inner():
       g = self.repo.git
       if g('rev-parse', ref).stdout.strip() != ref:
         g('checkout', ref)
       else:
         g('checkout', '--orphan', 'config')
       g('rm', '-rf', '.')
       with open('config.json', 'w') as f:
         f.write(config_data)
       g('add', 'config.json')
       self.repo.git_commit('a bad config file')
       g('update-ref', ref, 'HEAD')
     self.repo.run(inner)
 
   def testNonExist(self):
     r = self.mkRepo()
-    c = config_ref.ConfigRef(git.Ref(r, 'refs/metaconfig'))
+    c = config_ref.ConfigRef(git2.Ref(r, 'refs/metaconfig'))
     self.assertEqual(c.current, c.DEFAULTS)
     self.assertEqual(c['interval'], c.DEFAULTS['interval'])
 
   def testExistsBad(self):
     self.writeConfig("not valid config")
     r = self.mkRepo()
-    c = config_ref.ConfigRef(git.Ref(r, 'refs/metaconfig'))
+    c = config_ref.ConfigRef(git2.Ref(r, 'refs/metaconfig'))
     c.evaluate()
     self.assertEqual(c.current, c.DEFAULTS)
 
     self.writeConfig("[]")
     self.capture_stdio(r.run, 'fetch')
     c.evaluate()
     self.assertEqual(c.current, c.DEFAULTS)
 
   def testExistsGood(self):
     self.writeConfig('{"interval": 100}')
     r = self.mkRepo()
-    c = config_ref.ConfigRef(git.Ref(r, 'refs/metaconfig'))
+    c = config_ref.ConfigRef(git2.Ref(r, 'refs/metaconfig'))
     self.assertAlmostEqual(c['interval'], 100.0)
 
     self.writeConfig('{"interval": "cat"}')
     self.capture_stdio(r.run, 'fetch')
     c.evaluate()
     self.assertAlmostEqual(c['interval'], 100.0)