Refactor infra git libs and testing.

infra/services/gnumbd/test/gnumbd_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.
 
 import collections
 import json
 import logging
 import os
 import sys
 import tempfile
 
 from cStringIO import StringIO
 
-from infra.services.gnumbd import inner_loop as gnumbd
+from infra.services.gnumbd import gnumbd
 
-from infra.services.gnumbd.support import config_ref, data, git
+from infra.libs import git2
+from infra.libs.git2 import data
 
-from infra.services.gnumbd.test import gnumbd_smoketests
+from infra.services.gnumbd.test import gnumbd_test_definitions
 
 # should already be on path

[agable, 2014/07/25 21:03:39]

No longer necessary -- guaranteed by run.py.

[iannucci, 2014/07/26 00:18:43]

Done.

 import expect_tests  # pylint: disable=F0401

[agable, 2014/07/25 21:03:39]

Pylint also no longer necessary?

[iannucci, 2014/07/26 00:18:43]

Done.

 
 BASE_PATH = os.path.dirname(os.path.abspath(__file__))
 
 
 # TODO(iannucci): Make these first class data library objects
 class GitEntry(object):
   typ  = None
   mode = None
 
   def intern(self, repo):
@@ skipping 26 matching lines @@
     self.entries = entries
 
   def intern(self, repo):
     with tempfile.TemporaryFile() as tf:
       for path, entry in self.entries.iteritems():
         tf.write('%s %s %s\t%s' %
                  (entry.mode, entry.typ, entry.intern(repo), path))
       tf.seek(0)
       return repo.run('mktree', '-z', stdin=tf).strip()
 
-class TestRef(git.Ref):
+class TestRef(git2.Ref):
   def synthesize_commit(self, message, number=None, tree=None, svn=False,
                         footers=None):
     footers = footers or collections.OrderedDict()
     if number is not None:
       if svn:
         footers[gnumbd.GIT_SVN_ID] = [
             'svn://repo/path@%s 0039d316-1c4b-4281-b951-d872f2087c98' % number]
       else:
         footers[gnumbd.COMMIT_POSITION] = [
             gnumbd.FMT_COMMIT_POSITION(self, number)]
 
     commit = self.repo.synthesize_commit(self.commit, message, footers=footers,
                                          tree=tree)
     self.update_to(commit)
     return commit
 
 
 class TestClock(object):
   def __init__(self):
     self._time = 1402589336
 
   def time(self):
     self._time += 10
     return self._time
 
 
-class TestConfigRef(config_ref.ConfigRef):
+class TestConfigRef(gnumbd.GnumbdConfigRef):
   def update(self, **values):
     new_config = self.current
     new_config.update(values)
     self.ref.synthesize_commit(
         'update(%r)' % values.keys(),
         tree=GitTree({'config.json': GitFile(json.dumps(new_config))}))
 
 
-class TestRepo(git.Repo):
-  def __init__(self, short_name, tmpdir, clock, mirror_of=None):
+class TestRepo(git2.Repo):
+  def __init__(self, short_name, clock, mirror_of=None):
     super(TestRepo, self).__init__(mirror_of or 'local test repo')
     self._short_name = short_name
-    self.repos_dir = tmpdir
+    self.repos_dir = tempfile.tempdir
 
     if mirror_of is None:
-      self._repo_path = tempfile.mkdtemp(dir=self.repos_dir, suffix='.git')
+      self._repo_path = tempfile.mkdtemp(suffix='.git')
       self.run('init', '--bare')
 
     self._clock = clock
 
   # pylint: disable=W0212
   repo_path = property(lambda self: self._repo_path)
 
   def __getitem__(self, refstr):
     return TestRef(self, refstr)
 
   def synthesize_commit(self, parent, message, tree=None, footers=None):
     tree = tree or GitTree({'file': GitFile('contents')})
     tree = tree.intern(self) if isinstance(tree, GitTree) else tree
     assert isinstance(tree, str)
 
-    parents = [parent.hsh] if parent is not git.INVALID else []
+    parents = [parent.hsh] if parent is not git2.INVALID else []
 
     timestamp = data.CommitTimestamp(self._clock.time(), '+', 8, 0)
     user = data.CommitUser('Test User', 'test_user@example.com', timestamp)
 
     return self.get_commit(self.intern(data.CommitData(
         tree, parents, user, user, (), message.splitlines(),
         data.CommitData.merge_lines([], footers or {})
     ), 'commit'))
 
   def snap(self, include_committer=False, include_config=False):
     ret = {}
     if include_committer:
       fmt = '%H%x00committer %cn <%ce> %ci%n%n%B%x00%x00'
     else:
       fmt = '%H%x00%B%x00%x00'
     for ref in (r.ref for r in self.refglob('*')):
-      if ref == gnumbd.DEFAULT_CONFIG_REF and not include_config:
+      if ref == gnumbd.GnumbdConfigRef.REF and not include_config:
         continue
       log = self.run('log', ref, '--format=%s' % fmt)
       ret[ref] = collections.OrderedDict(
           (commit, message.splitlines())
           for commit, message in (
               r.split('\0') for r in log.split('\0\0\n') if r)
       )
     return ret
 
   def __repr__(self):
     return 'TestRepo(%r)' % self._short_name
 
 
-def RunTest(tmpdir, test_name):
+def RunTest(test_name):
   ret = []
   clock = TestClock()
-  origin = TestRepo('origin', tmpdir, clock)
-  local = TestRepo('local', tmpdir, clock, origin.repo_path)
+  origin = TestRepo('origin', clock)
+  local = TestRepo('local', clock, origin.repo_path)
 
-  cref = TestConfigRef(origin[gnumbd.DEFAULT_CONFIG_REF])
+  cref = TestConfigRef(origin)
   cref.update(enabled_refglobs=['refs/heads/*'], interval=0)
 
   def checkpoint(message, include_committer=False, include_config=False):
     ret.append([message, {'origin': origin.snap(include_committer,
                                                 include_config)}])
 
   def run(include_log=True):
     stdout = sys.stdout
     stderr = sys.stderr
 
@@ skipping 16 matching lines @@
       ret.append(traceback.format_exc().splitlines())
     finally:
       sys.stdout = stdout
       sys.stderr = stderr
 
       if include_log:
         root_logger.removeHandler(shandler)
         root_logger.setLevel(log_level)
         ret.append({'log output': logout.getvalue().splitlines()})
 
-  gnumbd_smoketests.GNUMBD_TESTS[test_name](
+  gnumbd_test_definitions.GNUMBD_TESTS[test_name](
       origin, local, cref, run, checkpoint)
 
   return expect_tests.Result(ret)
 
 
-def GenTests(tmpdir):
-  for test_name, test in gnumbd_smoketests.GNUMBD_TESTS.iteritems():
+@expect_tests.test_generator
+def GenTests():
+  for test_name, test in gnumbd_test_definitions.GNUMBD_TESTS.iteritems():
     yield expect_tests.Test(
         __package__ + '.' + test_name,
-        expect_tests.FuncCall(RunTest, tmpdir, test_name),
-        os.path.join(BASE_PATH, 'gnumbd_smoketests.expected'),
-        test_name, 'yaml', break_funcs=[test])
+        expect_tests.FuncCall(RunTest, test_name),
+        expect_base=test_name, ext='yaml', break_funcs=[test],
+        covers=(
+            expect_tests.Test.covers_obj(RunTest) +
+            expect_tests.Test.covers_obj(gnumbd_test_definitions)
+        ))