From 84b4e654a145d99c33765b0b1ddfebc1d1cfcc4d Mon Sep 17 00:00:00 2001 From: drculhane Date: Wed, 3 Apr 2024 10:29:41 -0400 Subject: [PATCH] Partially addresses issue #3050, updating PROTO tests. --- PROTO_tests/tests/message_test.py | 6 ++++-- PROTO_tests/tests/series_test.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PROTO_tests/tests/message_test.py b/PROTO_tests/tests/message_test.py index a3afa3fea5..28a5e1fcd8 100644 --- a/PROTO_tests/tests/message_test.py +++ b/PROTO_tests/tests/message_test.py @@ -90,7 +90,9 @@ def test_reply_msg(self): class TestJSONArgs: # TODO numpy dtypes are not supported by json, we probably want to add an issue to handle this SCALAR_TYPES = [int, float, bool, str] - PDA_TYPES = [ak.dtype(t) for t in ak.DTypes if t != "str"] +# The types below are support in arkouda, as noted in serverConfig.json. This may be +# the same issue noted in the above comment. + SUPPORTED_TYPES = [ak.bool, ak.uint64, ak.int64, ak.bigint, ak.uint8, ak.float64] @pytest.mark.parametrize("dtype", SCALAR_TYPES) def test_scalar_args(self, dtype): @@ -204,7 +206,7 @@ def test_fields_arg(self): ) assert args == expected - @pytest.mark.parametrize("dtype", PDA_TYPES) + @pytest.mark.parametrize("dtype", SUPPORTED_TYPES) def test_pda_arg(self, dtype): pda1 = ak.arange(3, dtype=dtype) pda2 = ak.arange(4, dtype=dtype) diff --git a/PROTO_tests/tests/series_test.py b/PROTO_tests/tests/series_test.py index b7491281a4..53c2665f2d 100644 --- a/PROTO_tests/tests/series_test.py +++ b/PROTO_tests/tests/series_test.py @@ -148,8 +148,10 @@ def test_value_counts(self): def test_concat(self): s = ak.Series(ak.arange(5)) - s2 = ak.Series(ak.arange(5, 11), ak.arange(5, 11)) - s3 = ak.Series(ak.arange(5, 10), ak.arange(5, 10)) + # added data= and index= clarifiers to the next two lines. + # without them, the index was interpreted as the name. + s2 = ak.Series(data=ak.arange(5, 11), index=ak.arange(5, 11)) + s3 = ak.Series(data=ak.arange(5, 10), index=ak.arange(5, 10)) df = ak.Series.concat([s, s2], axis=1) assert isinstance(df, ak.DataFrame)