From 3d1e12d96a3063c8236ada230ca52e2fb52b0cb3 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 5 Jul 2021 14:23:48 +0200
Subject: [PATCH] L2SS-289: Add head detach info to mocks
---
devices/test/common/test_lofar_git.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/devices/test/common/test_lofar_git.py b/devices/test/common/test_lofar_git.py
index 178eac535..52a1c7d87 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())
--
GitLab