diff --git a/devices/test/common/test_lofar_git.py b/devices/test/common/test_lofar_git.py index 178eac535d52dfc6a2edf393a80e3c699e37a8b7..52a1c7d876fc2827757f082e0f44a0a64b1ffc78 100644 --- a/devices/test/common/test_lofar_git.py +++ b/devices/test/common/test_lofar_git.py @@ -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())