update pyfunc tests

ICRAR · May 16, 2022 · 6ae7562 · 6ae7562
1 parent f57a36d
commit 6ae7562
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/daliuge-engine/dlg/apps/pyfunc.py b/daliuge-engine/dlg/apps/pyfunc.py
@@ -235,7 +235,7 @@ def _init_func_defaults(self):
             logger.error(f"Wrong format or type for function defaults for "+\
                 "{self.f.__name__}: {self.func_defaults}, {type(self.func_defaults)}")
             raise ValueError
-        if self.input_parser is DropParser.PICKLE:
+        if DropParser(self.input_parser) is DropParser.PICKLE:
             # only values are pickled, get them unpickled
             for name, value in self.func_defaults.items():
                 self.func_defaults[name] = deserialize_data(value)

diff --git a/daliuge-engine/test/apps/test_pyfunc.py b/daliuge-engine/test/apps/test_pyfunc.py
@@ -72,7 +72,13 @@ def _PyFuncApp(oid, uid, f, **kwargs):
 
     fcode, fdefaults = pyfunc.serialize_func(f)
     return pyfunc.PyFuncApp(
-        oid, uid, func_name=fname, func_code=fcode, func_defaults=fdefaults, pickle=True, **kwargs
+        oid, uid,
+        func_name=fname,
+        func_code=fcode,
+        func_defaults=fdefaults,
+        input_parser=pyfunc.DropParser.PICKLE,
+        output_parser=pyfunc.DropParser.PICKLE,
+        **kwargs
     )
 
 

diff --git a/daliuge-engine/test/test_drop.py b/daliuge-engine/test/test_drop.py
@@ -136,7 +136,7 @@ def run(self):
                 assert isinstance(self.f, float)
                 assert self.f == 2.0
                 assert isinstance(self.s, str)
-                assert self.s is "default"
+                assert self.s == "default"
                 assert isinstance(self.e, MyEnum)
                 assert self.e is MyEnum("default")
                 assert isinstance(self.l, list)