Skip to content

Commit

Permalink
Testcase fix
Browse files Browse the repository at this point in the history
bugzilla: 1645221
tendrl-bug-id: Tendrl#1078

Signed-off-by: GowthamShanmugam <[email protected]>
  • Loading branch information
GowthamShanmugam committed Apr 2, 2019
1 parent 840da09 commit 9a08d2a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from tendrl.commons.objects.cluster.atoms.stop_integration_services \
import StopIntegrationServices
from tendrl.commons.objects.cluster import Cluster
from tendrl.commons.objects.node_context import NodeContext
from tendrl.commons.objects.job import Job


Expand Down Expand Up @@ -82,6 +83,8 @@ def read(*args, **kwargs):
return return_hash()
elif args[0] == "clusters/test_uuid/data":
return data()
elif args[0] == "/nodes/abc/NodeContext/data":
return maps.NamedDict(value='{"tags": "[test]"}')
else:
return None

Expand Down Expand Up @@ -136,6 +139,8 @@ def test_run():
NS.publisher_id = "test"
setattr(NS, "tendrl", maps.NamedDict())
setattr(NS.tendrl, "objects", maps.NamedDict(Job=Job))
setattr(NS, "config", maps.NamedDict(data={}))
NS.tendrl.objects.NodeContext = mock.MagicMock()
NS.tendrl.objects.Cluster = Cluster
with patch.object(NS.tendrl.objects.Job, 'save', save):
with patch.object(NS._int.client, 'read', read):
Expand All @@ -146,13 +151,12 @@ def test_run():
'load',
load_cluster
):
ret_val = obj.run()
assert ret_val is True
ret_val = obj.run()
assert ret_val is True
with patch.object(NS.tendrl.objects.Job, 'save', save):
with patch.object(NS._int.client, 'read', read):
with patch.object(
NS.tendrl.objects.Job, 'load', load_unfinished_job):
with patch.object(time, 'sleep', sleep):
# import pdb; pdb.set_trace();
ret_val = obj.run()
assert ret_val is False
ret_val = obj.run()
assert ret_val is False
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from tendrl.commons.objects.cluster.atoms.stop_monitoring_services \
import StopMonitoringServices
from tendrl.commons.objects.cluster import Cluster
from tendrl.commons.objects.node_context import NodeContext
from tendrl.commons.objects.job import Job


Expand Down Expand Up @@ -82,6 +83,8 @@ def read(*args, **kwargs):
return return_hash()
elif args[0] == "clusters/test_uuid/data":
return data()
elif args[0] == "/nodes/abc/NodeContext/data":
return maps.NamedDict(value='{"tags": "[test]"}')
else:
return None

Expand Down Expand Up @@ -130,16 +133,20 @@ def test_run():
NS.publisher_id = "test"
setattr(NS, "tendrl", maps.NamedDict())
setattr(NS.tendrl, "objects", maps.NamedDict(Job=Job))
setattr(NS, "config", maps.NamedDict(data={}))
NS.tendrl.objects.NodeContext = mock.MagicMock()
NS.tendrl.objects.Cluster = Cluster
with patch.object(NS.tendrl.objects.Job, 'save', save):
with patch.object(NS._int.client, 'read', read):
with patch.object(Job, 'load', load_finished_job):
ret_val = obj.run()
assert ret_val is True
with patch.object(NodeContext, 'load', "up"):
ret_val = obj.run()
assert ret_val is True
with patch.object(NS.tendrl.objects.Job, 'save', save):
with patch.object(NS._int.client, 'read', read):
with patch.object(
NS.tendrl.objects.Job, 'load', load_unfinished_job):
with patch.object(time, 'sleep', sleep):
ret_val = obj.run()
assert ret_val is False
with patch.object(NodeContext, 'load', "down"):
ret_val = obj.run()
assert ret_val is False

0 comments on commit 9a08d2a

Please sign in to comment.