Skip to content
Snippets Groups Projects
Commit 3d1e12d9 authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-289: Add head detach info to mocks

parent f8509381
Branches
Tags
1 merge request!68L2SS-289: Rewrite of logging structure
......@@ -35,9 +35,11 @@ class TestLofarGit(base.TestCase):
m_is_dirty = mock.Mock()
m_is_dirty.return_value = True
m_head = mock.Mock(is_detached=False)
m_get_repo.return_value = mock.Mock(
active_branch="main", commit=m_commit, tags=[],
is_dirty=m_is_dirty)
is_dirty=m_is_dirty, head=m_head)
# No need for special string equal in Python
self.assertEqual("*main [123456]", lofar_git.get_version())
......@@ -52,12 +54,14 @@ class TestLofarGit(base.TestCase):
m_is_dirty = mock.Mock()
m_is_dirty.return_value = False
m_head = mock.Mock(is_detached=False)
m_tag = mock.Mock(commit="123456")
m_tag.__str__ = mock.Mock(return_value= "version-1.2")
m_get_repo.return_value = mock.Mock(
active_branch="main", commit=m_commit,
tags=[m_tag], is_dirty=m_is_dirty)
tags=[m_tag], is_dirty=m_is_dirty, head=m_head)
self.assertEqual("version-1.2", lofar_git.get_version())
......@@ -71,13 +75,15 @@ class TestLofarGit(base.TestCase):
m_is_dirty = mock.Mock()
m_is_dirty.return_value = False
m_head = mock.Mock(is_detached=False)
m_tag = mock.Mock(commit="123456")
m_tag.__str__ = mock.Mock(return_value= "version-1.2")
# Now m_get_repo is mocked using a decorator
m_get_repo.return_value = mock.Mock(
active_branch="main", commit=m_commit,
tags=[m_tag], is_dirty=m_is_dirty)
tags=[m_tag], is_dirty=m_is_dirty, head=m_head)
self.assertEqual("version-1.2", lofar_git.get_version())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment