Skip to content

Commit 40200b3

Browse files
committed
Resolved conflicts
1 parent 52d2928 commit 40200b3

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

pydra/engine/audit.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,13 @@ def audit_check(self, flag):
170170
return self.audit_flags & flag
171171

172172
def audit_task(self, task):
173-
173+
label = task.name
174174
if hasattr(task.inputs, "executable"):
175-
label = task.name
175+
command = task.cmdline
176176
# assume function task
177177
else:
178178
# work on changing this to function name
179-
label = "Unknown"
180-
181-
if hasattr(task.inputs, "args"):
182-
command = task.cmdline
183-
else:
184-
command = "Unknown"
179+
command = None
185180

186181
start_message = {
187182
"@id": self.aid,

pydra/engine/tests/test_task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ def testfunc(a: int, b: float = 0.1) -> ty.NamedTuple("Output", [("out", float)]
10051005
data = json.load(f)
10061006
if "label" in data:
10071007
json_content.append(True)
1008-
assert "Python Function" == data["label"]
1008+
assert "testfunc" == data["label"]
10091009
assert any(json_content)
10101010

10111011

0 commit comments

Comments
 (0)