Add test for functions returning a single value

When a function returns a single value, Scheduler should return a List
of these values alone (not wrapped in tuples).

For functions returning multiple values, Scheduler should return a List
of tuples which each contain the result of a function call.

Both of these cases are now tested.

Author: TheGreatCabbage

test/test_scheduler.py

@@ -33,26 +33,34 @@
         _long_task,
         _get_input_output,
         _get_input_output_numpy,
+        _get_input_output_single_result,
+        _get_input_output_two_results,
         assert_results,
         assert_results_numpy,
         _func,
         _funcq,
         _func_no_params,
         _func_numpy,
         _func_no_return,
+        _func_returns_single_value,
+        _func_returns_two_values,
     )
 except:
     from utils import (
         _long_task,
         _get_input_output,
         _get_input_output_numpy,
+        _get_input_output_single_result,
+        _get_input_output_two_results,
         assert_results,
         assert_results_numpy,
         _func,
         _funcq,
         _func_no_params,
         _func_numpy,
         _func_no_return,
+        _func_returns_single_value,
+        _func_returns_two_values,
     )
 
 
@@ -187,6 +195,39 @@ def test_map():
     assert scheduler.finished
 
 
+def test_map_one_return_value():
+    """Tests whether `map()` works correctly when the target function only returns a single result."""
+    scheduler = Scheduler()
+
+    args, expected = _get_input_output_single_result()
+
+    loop = asyncio.get_event_loop()
+    results: List[Tuple[int]] = loop.run_until_complete(
+        scheduler.map(target=_func_returns_single_value, args=args)
+    )
+
+    assert len(expected) == len(results)
+    assert all([not hasattr(r, "__len__") for r in results])
+
+    assert scheduler.finished
+
+
+def test_map_two_return_values():
+    """Tests whether `map()` works correctly when the target function returns two results."""
+    scheduler = Scheduler()
+
+    args, expected = _get_input_output_two_results()
+
+    loop = asyncio.get_event_loop()
+    results: List[Tuple[int, int]] = loop.run_until_complete(
+        scheduler.map(target=_func_returns_two_values, args=args)
+    )
+
+    assert all([hasattr(r, "__len__") for r in results])
+    assert_results(expected, results)
+    assert scheduler.finished
+
+
 def test_map_no_args():
     """
     Tests whether `map()` works correctly with no arguments.
@@ -307,4 +348,5 @@ async def terminate():
 
 if __name__ == "__main__":
     test_shared_memory_numpy()
+    test_map_two_return_values()
     print("Finished.")

test/utils.py

@@ -47,6 +47,18 @@ def _get_input_output() -> Tuple[List, List]:
     return args, expected_output
 
 
+def _get_input_output_single_result() -> Tuple[List, List]:
+    args = [(i,) for i in range(20)]
+    expected_output = [(_func_returns_single_value(*a)) for a in args]
+    return args, expected_output
+
+
+def _get_input_output_two_results() -> Tuple[List, List]:
+    args = [(i,) for i in range(20)]
+    expected_output = [(_func_returns_two_values(*a)) for a in args]
+    return args, expected_output
+
+
 def _get_input_output_numpy() -> Tuple[List, List]:
     args = [(i, 500000 + i ** 2) for i in range(15)]
     expected_output = [(_func_numpy(*a)) for a in args]
@@ -77,6 +89,14 @@ def _func_numpy(x, y) -> ndarray:
     return numpy.arange(x, y)
 
 
+def _func_returns_single_value(x: int) -> int:
+    return 3 * x
+
+
+def _func_returns_two_values(x: int) -> Tuple[int, int]:
+    return 5 * x, x ** 2
+
+
 def _func_no_return(x: int) -> None:
     pass