Commit: 5ae71201091086e991e419746583e543e8491da9 - allura (git)

allura

Commit MetaInfo

• Revisión: 5ae71201091086e991e419746583e543e8491da9 (tree)
• Tiempo: 2011-10-06 02:14:56
• Autor: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#2020] Add tests for new Hg repo stuff

Signed-off-by: Rick Copeland <[e-mail]>

Cambiar Resumen

• modified: Allura/allura/model/repo.py
• modified: Allura/allura/model/repo_refresh.py
• modified: ForgeGit/forgegit/tests/model/test_repository.py
• modified: ForgeHg/forgehg/tests/model/test_repository.py
• modified: ForgeSVN/forgesvn/model/svn.py
• modified: ForgeSVN/forgesvn/tests/model/test_repository.py

Diferencia incremental

--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -113,6 +113,10 @@ class RepoObject(object):
     def legacy(self):
         return Object(object_id=self._id)
 
+    @property
+    def object_id(self):
+        return self._id
+
 class Commit(RepoObject):
     # Ephemeral attrs
     repo=None
@@ -229,7 +233,12 @@ class Tree(RepoObject):
         for x in self.blob_ids:
             if README_RE.match(x.name):
                 name = x.name
-                text = self.repo.open_blob(Object(object_id=x.id)).read()
+                obj = Object(
+                    object_id=x.id,
+                    path=lambda:self.path() + x['name'],
+                    commit=Object(
+                        object_id=self.commit._id))
+                text = self.repo.open_blob(obj).read()
                 text = h.really_unicode(text)
                 break
         if text == '':

--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -66,6 +66,7 @@ def refresh_repo(repo, all_commits=False, notify=True):
 
 def refresh_commit_trees(ci, cache):
     '''Refresh the list of trees included withn a commit'''
+    if ci.tree_id is None: return
     trees_doc = TreesDoc(dict(
             _id=ci._id,
             tree_ids = list(trees(ci.tree_id, cache))))
@@ -228,6 +229,7 @@ def unknown_commit_ids(all_commit_ids):
 
 def compute_diffs(repo_id, tree_cache, rhs_ci):
     '''compute simple differences between a commit and its first parent'''
+    if rhs_ci.tree_id is None: return
     def _walk_tree(tree, tree_index):
         for x in tree.blob_ids: yield x.id
         for x in tree.other_ids: yield x.id

--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -51,7 +51,9 @@ class TestNewGit(unittest.TestCase):
             ci.count_revisions()
             ci.context()
         self.rev.tree.ls()
-        print self.rev.tree.readme()
+        # print self.rev.tree.readme()
+        assert self.rev.tree.readme() == (
+            'README', '<pre>This is readme\nAnother Line\n</pre>')
         assert self.rev.tree.path() == '/'
         assert self.rev.tree.url() == (
             '/p/test/src/ci/'

--- a/ForgeHg/forgehg/tests/model/test_repository.py
+++ b/ForgeHg/forgehg/tests/model/test_repository.py
@@ -7,8 +7,60 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura import model as M
 from forgehg import model as HM
 
+class TestNewRepo(unittest.TestCase):
+
+    def setUp(self):
+        setup_basic_test()
+        setup_global_objects()
+        h.set_context('test', 'src')
+        repo_dir = pkg_resources.resource_filename(
+            'forgehg', 'tests/data')
+        self.repo = HM.Repository(
+            name='testrepo.hg',
+            fs_path=repo_dir,
+            url_path = '/test/',
+            tool = 'hg',
+            status = 'creating')
+        self.repo.refresh()
+        self.rev = M.repo.Commit.query.get(_id=self.repo.heads[0]['object_id'])
+        self.rev.repo = self.repo
+        ThreadLocalORMSession.flush_all()
+        ThreadLocalORMSession.close_all()
+
+    def test_commit(self):
+        assert self.rev.primary() is self.rev
+        assert self.rev.index_id().startswith('allura/model/repo/Commit#')
+        self.rev.author_url
+        self.rev.committer_url
+        assert self.rev.tree._id == self.rev.tree_id
+        assert self.rev.summary == self.rev.message.splitlines()[0]
+        assert self.rev.shorthand_id() == '[1c7eb5]'
+        assert self.rev.symbolic_ids == (['default'], ['tip'])
+        assert self.rev.url() == (
+            '/p/test/src/ci/'
+            '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/')
+        all_cis = self.rev.log(0, 1000)
+        assert len(all_cis) == 5
+        assert self.rev.log(1,1000) == all_cis[1:]
+        assert self.rev.log(0,3) == all_cis[:3]
+        assert self.rev.log(1,2) == all_cis[1:3]
+        for ci in all_cis:
+            ci.count_revisions()
+            ci.context()
+        self.rev.tree.ls()
+        assert self.rev.tree.readme() == (
+            'README', '<pre>This is readme\nAnother line\n</pre>')
+        assert self.rev.tree.path() == '/'
+        assert self.rev.tree.url() == (
+            '/p/test/src/ci/'
+            '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/'
+            'tree/')
+        self.rev.tree.by_name['README']
+        assert self.rev.tree.is_blob('README') == True
+
 class TestHgRepo(unittest.TestCase):
 
     def setUp(self):

--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -240,7 +240,7 @@ class SVNImplementation(M.RepositoryImplementation):
             lst[path.action].append(h.really_unicode(path.path))
 
     def refresh_commit_info(self, oid, seen_object_ids):
-        from alllura.model.repo import CommitDoc
+        from allura.model.repo import CommitDoc
         if CommitDoc.m.find(dict(_id=oid)).count():
             return False
         try:
@@ -265,7 +265,7 @@ class SVNImplementation(M.RepositoryImplementation):
                     tree_id=None,
                     committed=user,
                     authored=user,
-                    message=log.entry.message,
+                    message=log_entry.message,
                     parent_ids=[],
                     child_ids=[]))
             if revno > 1:

--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -3,14 +3,62 @@ import shutil
 import unittest
 import pkg_resources
 
-from pylons import c
-
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura import model as M
 from forgesvn import model as SM
 
+class TestNewRepo(unittest.TestCase):
+
+    def setUp(self):
+        setup_basic_test()
+        setup_global_objects()
+        h.set_context('test', 'src')
+        repo_dir = pkg_resources.resource_filename(
+            'forgesvn', 'tests/data/')
+        self.repo = SM.Repository(
+            name='testsvn',
+            fs_path=repo_dir,
+            url_path = '/test/',
+            tool = 'svn',
+            status = 'creating')
+        self.repo.refresh()
+        self.rev = M.repo.Commit.query.get(_id=self.repo.heads[0]['object_id'])
+        self.rev.repo = self.repo
+        ThreadLocalORMSession.flush_all()
+        ThreadLocalORMSession.close_all()
+
+    def test_commit(self):
+        assert self.rev.primary() is self.rev
+        assert self.rev.index_id().startswith('allura/model/repo/Commit#')
+        self.rev.author_url
+        self.rev.committer_url
+        assert self.rev.summary == self.rev.message.splitlines()[0]
+        assert self.rev.shorthand_id() == '[r5]'
+        assert self.rev.symbolic_ids == ([], [])
+        assert self.rev.url() == (
+            '/p/test/src/5/')
+        all_cis = self.rev.log(0, 1000)
+        assert len(all_cis) == 5
+        assert self.rev.log(1,1000) == all_cis[1:]
+        assert self.rev.log(0,3) == all_cis[:3]
+        assert self.rev.log(1,2) == all_cis[1:3]
+        for ci in all_cis:
+            ci.count_revisions()
+            ci.context()
+        self.rev.tree.ls()
+        assert self.rev.tree.readme() == (
+            'README', '<pre>This is readme\nAnother line\n</pre>')
+        assert self.rev.tree.path() == '/'
+        assert self.rev.tree.url() == (
+            '/p/test/src/ci/'
+            '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/'
+            'tree/')
+        self.rev.tree.by_name['README']
+        assert self.rev.tree.is_blob('README') == True
+
 class TestSVNRepo(unittest.TestCase):
 
     def setUp(self):