From 982ed75a78b54c7badfafbef580a7eab4a435355 Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Thu, 23 Nov 2023 21:18:19 -0500 Subject: [PATCH 1/9] DE-701 | initial commit --- .circleci/config.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a75aba3e..1e173696 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 -# orbs: -# coveralls: coveralls/coveralls@2.2.1 +orbs: + codecov: codecov/codecov@3.3.0 workflows: ci: @@ -105,9 +105,5 @@ jobs: - store_test_results: path: test-results - # - run: - # name: Upload to Coveralls - # command: | - # if [ "<< parameters.python_version >>" = "3.11" && "<< parameters.arangodb_config >>" = "single" && "<< parameters.arangodb_license >>" = "community" && "<< parameters.arangodb_version >>" = "latest" ]; then - # coveralls/upload - # fi + - codecov/upload: + file: coverage.xml \ No newline at end of file From 05c37031c17a112b9c00babd6995255efe15f922 Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Thu, 23 Nov 2023 21:25:34 -0500 Subject: [PATCH 2/9] add newline --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e173696..3abf675a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,4 +106,4 @@ jobs: path: test-results - codecov/upload: - file: coverage.xml \ No newline at end of file + file: coverage.xml From 29399534596d46cc6ef6b3113b20bd5f5f77d219 Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 12:15:04 -0500 Subject: [PATCH 3/9] new: `docker logs` --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3abf675a..1d574a29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,6 +82,8 @@ jobs: - run: docker ps -a + - run: docker logs arango + - run: name: "Run pytest" command: | From 5632cf860e5bd33bc0704cb37c010ea6474976cd Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 12:15:14 -0500 Subject: [PATCH 4/9] remove `--rm` from `starter.sh` --- starter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starter.sh b/starter.sh index b0374c58..d0973f37 100755 --- a/starter.sh +++ b/starter.sh @@ -39,7 +39,7 @@ else conf_file="${setup}" fi -docker run -d --rm \ +docker run -d \ --name arango \ -p 8528:8528 \ -p 8529:8529 \ From aa82b00faa8f66631d1cd35f3a06aacf31184bdb Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 14:34:23 -0500 Subject: [PATCH 5/9] temp: lower coverage --- tests/test_pregel.py | 110 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/tests/test_pregel.py b/tests/test_pregel.py index e17da72b..397ada82 100644 --- a/tests/test_pregel.py +++ b/tests/test_pregel.py @@ -1,66 +1,66 @@ -import time +# import time -import pytest -from packaging import version +# import pytest +# from packaging import version -from arango.exceptions import ( - PregelJobCreateError, - PregelJobDeleteError, - PregelJobGetError, -) -from tests.helpers import assert_raises, generate_string +# from arango.exceptions import ( +# PregelJobCreateError, +# PregelJobDeleteError, +# PregelJobGetError, +# ) +# from tests.helpers import assert_raises, generate_string -def test_pregel_attributes(db, username): - assert db.pregel.context in ["default", "async", "batch", "transaction"] - assert db.pregel.username == username - assert db.pregel.db_name == db.name - assert repr(db.pregel) == f"" +# def test_pregel_attributes(db, username): +# assert db.pregel.context in ["default", "async", "batch", "transaction"] +# assert db.pregel.username == username +# assert db.pregel.db_name == db.name +# assert repr(db.pregel) == f"" -def test_pregel_management(db, db_version, graph, cluster): - if cluster: - pytest.skip("Not tested in a cluster setup") +# def test_pregel_management(db, db_version, graph, cluster): +# if cluster: +# pytest.skip("Not tested in a cluster setup") - # Test create pregel job - job_id = db.pregel.create_job( - graph.name, - "pagerank", - store=False, - max_gss=100, - thread_count=1, - async_mode=False, - result_field="result", - algorithm_params={"threshold": 0.000001}, - ) - assert isinstance(job_id, int) +# # Test create pregel job +# job_id = db.pregel.create_job( +# graph.name, +# "pagerank", +# store=False, +# max_gss=100, +# thread_count=1, +# async_mode=False, +# result_field="result", +# algorithm_params={"threshold": 0.000001}, +# ) +# assert isinstance(job_id, int) - # Test create pregel job with unsupported algorithm - with assert_raises(PregelJobCreateError) as err: - db.pregel.create_job(graph.name, "invalid") - assert err.value.error_code in {4, 10, 1600} +# # Test create pregel job with unsupported algorithm +# with assert_raises(PregelJobCreateError) as err: +# db.pregel.create_job(graph.name, "invalid") +# assert err.value.error_code in {4, 10, 1600} - # Test get existing pregel job - job = db.pregel.job(job_id) - assert isinstance(job["state"], str) - assert isinstance(job["aggregators"], dict) - assert isinstance(job["gss"], int) - assert isinstance(job["received_count"], int) - assert isinstance(job["send_count"], int) - assert "total_runtime" in job +# # Test get existing pregel job +# job = db.pregel.job(job_id) +# assert isinstance(job["state"], str) +# assert isinstance(job["aggregators"], dict) +# assert isinstance(job["gss"], int) +# assert isinstance(job["received_count"], int) +# assert isinstance(job["send_count"], int) +# assert "total_runtime" in job - # Test delete existing pregel job - assert db.pregel.delete_job(job_id) is True - time.sleep(0.2) - if db_version < version.parse("3.11.0"): - with assert_raises(PregelJobGetError) as err: - db.pregel.job(job_id) - assert err.value.error_code in {4, 10, 1600} - else: - job = db.pregel.job(job_id) - assert job["state"] == "canceled" +# # Test delete existing pregel job +# assert db.pregel.delete_job(job_id) is True +# time.sleep(0.2) +# if db_version < version.parse("3.11.0"): +# with assert_raises(PregelJobGetError) as err: +# db.pregel.job(job_id) +# assert err.value.error_code in {4, 10, 1600} +# else: +# job = db.pregel.job(job_id) +# assert job["state"] == "canceled" - # Test delete missing pregel job - with assert_raises(PregelJobDeleteError) as err: - db.pregel.delete_job(generate_string()) - assert err.value.error_code in {4, 10, 1600} +# # Test delete missing pregel job +# with assert_raises(PregelJobDeleteError) as err: +# db.pregel.delete_job(generate_string()) +# assert err.value.error_code in {4, 10, 1600} From 95b8994c1743abb523afc343ec371a122aa40e9e Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 14:41:35 -0500 Subject: [PATCH 6/9] update config --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d574a29..150934b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,7 @@ workflows: jobs: - lint - test: + name: test-python-<< matrix.python_version >>-arangodb-<< matrix.arangodb_version >>-<< matrix.arangodb_config >>-<< matrix.arangodb_license >> matrix: parameters: # TODO: Revisit why pyenv doesn't recognize 3.12 @@ -99,7 +100,7 @@ jobs: fi echo "Running pytest with args: ${args[@]}" - pytest --cov=arango --cov-report=xml "${args[@]}" + pytest --cov=arango --cov-report=xml --cov-report term-missing --color=yes --code-highlight=yes "${args[@]}" - store_artifacts: path: test-results From 0511bfe3505ba79c7e7dcc953302deb688493761 Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 14:42:48 -0500 Subject: [PATCH 7/9] fix yml indentation --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 150934b8..5769ab93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ workflows: jobs: - lint - test: - name: test-python-<< matrix.python_version >>-arangodb-<< matrix.arangodb_version >>-<< matrix.arangodb_config >>-<< matrix.arangodb_license >> + name: test-python-<< matrix.python_version >>-arangodb-<< matrix.arangodb_version >>-<< matrix.arangodb_config >>-<< matrix.arangodb_license >> matrix: parameters: # TODO: Revisit why pyenv doesn't recognize 3.12 From cde7eb85c8b541c40392cf24c530e1c14adc577b Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 14:43:57 -0500 Subject: [PATCH 8/9] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5769ab93..1d90b871 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ workflows: jobs: - lint - test: - name: test-python-<< matrix.python_version >>-arangodb-<< matrix.arangodb_version >>-<< matrix.arangodb_config >>-<< matrix.arangodb_license >> + name: Python (<< matrix.python_version >>) - ArangoDB (<< matrix.arangodb_license >>, << matrix.arangodb_version >> << matrix.arangodb_config >>) matrix: parameters: # TODO: Revisit why pyenv doesn't recognize 3.12 From b5a4c4f5e207de79264f916eeaa720704a183604 Mon Sep 17 00:00:00 2001 From: Anthony Mahanna Date: Fri, 15 Dec 2023 14:45:54 -0500 Subject: [PATCH 9/9] revert aa82b00 --- tests/test_pregel.py | 110 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/tests/test_pregel.py b/tests/test_pregel.py index 397ada82..e17da72b 100644 --- a/tests/test_pregel.py +++ b/tests/test_pregel.py @@ -1,66 +1,66 @@ -# import time +import time -# import pytest -# from packaging import version +import pytest +from packaging import version -# from arango.exceptions import ( -# PregelJobCreateError, -# PregelJobDeleteError, -# PregelJobGetError, -# ) -# from tests.helpers import assert_raises, generate_string +from arango.exceptions import ( + PregelJobCreateError, + PregelJobDeleteError, + PregelJobGetError, +) +from tests.helpers import assert_raises, generate_string -# def test_pregel_attributes(db, username): -# assert db.pregel.context in ["default", "async", "batch", "transaction"] -# assert db.pregel.username == username -# assert db.pregel.db_name == db.name -# assert repr(db.pregel) == f"" +def test_pregel_attributes(db, username): + assert db.pregel.context in ["default", "async", "batch", "transaction"] + assert db.pregel.username == username + assert db.pregel.db_name == db.name + assert repr(db.pregel) == f"" -# def test_pregel_management(db, db_version, graph, cluster): -# if cluster: -# pytest.skip("Not tested in a cluster setup") +def test_pregel_management(db, db_version, graph, cluster): + if cluster: + pytest.skip("Not tested in a cluster setup") -# # Test create pregel job -# job_id = db.pregel.create_job( -# graph.name, -# "pagerank", -# store=False, -# max_gss=100, -# thread_count=1, -# async_mode=False, -# result_field="result", -# algorithm_params={"threshold": 0.000001}, -# ) -# assert isinstance(job_id, int) + # Test create pregel job + job_id = db.pregel.create_job( + graph.name, + "pagerank", + store=False, + max_gss=100, + thread_count=1, + async_mode=False, + result_field="result", + algorithm_params={"threshold": 0.000001}, + ) + assert isinstance(job_id, int) -# # Test create pregel job with unsupported algorithm -# with assert_raises(PregelJobCreateError) as err: -# db.pregel.create_job(graph.name, "invalid") -# assert err.value.error_code in {4, 10, 1600} + # Test create pregel job with unsupported algorithm + with assert_raises(PregelJobCreateError) as err: + db.pregel.create_job(graph.name, "invalid") + assert err.value.error_code in {4, 10, 1600} -# # Test get existing pregel job -# job = db.pregel.job(job_id) -# assert isinstance(job["state"], str) -# assert isinstance(job["aggregators"], dict) -# assert isinstance(job["gss"], int) -# assert isinstance(job["received_count"], int) -# assert isinstance(job["send_count"], int) -# assert "total_runtime" in job + # Test get existing pregel job + job = db.pregel.job(job_id) + assert isinstance(job["state"], str) + assert isinstance(job["aggregators"], dict) + assert isinstance(job["gss"], int) + assert isinstance(job["received_count"], int) + assert isinstance(job["send_count"], int) + assert "total_runtime" in job -# # Test delete existing pregel job -# assert db.pregel.delete_job(job_id) is True -# time.sleep(0.2) -# if db_version < version.parse("3.11.0"): -# with assert_raises(PregelJobGetError) as err: -# db.pregel.job(job_id) -# assert err.value.error_code in {4, 10, 1600} -# else: -# job = db.pregel.job(job_id) -# assert job["state"] == "canceled" + # Test delete existing pregel job + assert db.pregel.delete_job(job_id) is True + time.sleep(0.2) + if db_version < version.parse("3.11.0"): + with assert_raises(PregelJobGetError) as err: + db.pregel.job(job_id) + assert err.value.error_code in {4, 10, 1600} + else: + job = db.pregel.job(job_id) + assert job["state"] == "canceled" -# # Test delete missing pregel job -# with assert_raises(PregelJobDeleteError) as err: -# db.pregel.delete_job(generate_string()) -# assert err.value.error_code in {4, 10, 1600} + # Test delete missing pregel job + with assert_raises(PregelJobDeleteError) as err: + db.pregel.delete_job(generate_string()) + assert err.value.error_code in {4, 10, 1600}