Fix testnode watching repositories when HEAD is a merge commit

and a few cleanups in test suite See merge request !1126

Fix testnode watching repositories when HEAD is a merge commit
and a few cleanups in test suite See merge request !1126
68b6fa0a · Jérome Perrin · a8f32683 · 42cd1159 · 68b6fa0a · 68b6fa0a
Commit 68b6fa0a authored May 22, 2020 by Jérome Perrin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 87 additions and 33 deletions

erp5/tests/testERP5TestNode.py erp5/tests/testERP5TestNode.py +86 -32

erp5/util/testnode/Updater.py erp5/util/testnode/Updater.py +1 -1

No files found.
--- a/erp5/tests/testERP5TestNode.py
+++ b/erp5/tests/testERP5TestNode.py
--- a/erp5/util/testnode/Updater.py
+++ b/erp5/util/testnode/Updater.py
@@ -143,7 +143,7 @@ class Updater(object):
    if not path_list:
      path_list = self._path_list
    if self.getRepositoryType() == GIT_TYPE:
-      h = self._git('log', '-1', '--format=%H', '--', *path_list)
+      h = self._git('log', '-1', '--format=%H', '--full-history', '--', *path_list)
      return self._git_find_rev(h)
    elif self.getRepositoryType() == SVN_TYPE:
      stdout = self.spawn('svn', 'info', *path_list)['stdout']