Skip to content

Commit

Permalink
Merge branch 'master' into LIU-128
Browse files Browse the repository at this point in the history
# Conflicts:
#	daliuge-engine/dlg/apps/simple.py
#	daliuge-engine/dlg/drop.py
#	daliuge-engine/dlg/droputils.py
#	daliuge-engine/dlg/io.py
#	daliuge-engine/dlg/manager/cmdline.py
#	daliuge-engine/dlg/manager/node_manager.py
#	daliuge-engine/dlg/rpc.py
#	daliuge-engine/test/apps/test_crc.py
#	daliuge-engine/test/apps/test_simple.py
#	daliuge-engine/test/manager/test_dm.py
  • Loading branch information
pritchardn committed Dec 9, 2021
2 parents 310b431 + 7fa67ff commit 7ede09b
Show file tree
Hide file tree
Showing 174 changed files with 14,241 additions and 7,893 deletions.
4 changes: 2 additions & 2 deletions OpenAPI/tests/managers_test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
nm = DefaultApi(nm_client)

print("sessions: %r" % (dim.get_sessions(),))
dim.create_session(inline_object={'sessionId': 'abc'})
dim.create_session(inline_object={"sessionId": "abc"})
print("sessions in NM: %r" % (nm.get_sessions(),))
print("sessions in DIM: %r" % (dim.get_sessions(),))
nodes = dim.get_cm_nodes()
print(nodes)
if '127.0.0.1' not in nodes:
if "127.0.0.1" not in nodes:
raise ValueError()
Loading

0 comments on commit 7ede09b

Please sign in to comment.