diff --git a/hive/server/serve.py b/hive/server/serve.py index 230c08faa5f25da25981b6977b502ebfad77eef8..f881c4334a0d40f7e761c71c11c8b2c88d65efb4 100644 --- a/hive/server/serve.py +++ b/hive/server/serve.py @@ -106,6 +106,7 @@ def build_methods(): 'follow_api.get_blog': condenser_api.get_blog, 'follow_api.get_blog_entries': condenser_api.get_blog_entries, 'follow_api.get_reblogged_by': condenser_api.get_reblogged_by, + # three functions under are not implemented, should we remove them? 'follow_api.get_feed_entries': follow_api.get_feed_entries, 'follow_api.get_feed': follow_api.get_feed, 'follow_api.get_blog_authors': follow_api.get_blog_authors @@ -125,6 +126,7 @@ def build_methods(): 'tags_api.get_post_discussions_by_payout': condenser_api.get_post_discussions_by_payout, 'tags_api.get_comment_discussions_by_payout': condenser_api.get_comment_discussions_by_payout, 'tags_api.get_active_votes' : tags_api.get_active_votes, + # five functions under are not implemented, should we remove them? 'tags_api.get_tags_used_by_author' : tags_api.get_tags_used_by_author, 'tags_api.get_discussions_by_active' : tags_api.get_discussions_by_active, 'tags_api.get_discussions_by_cashout' : tags_api.get_discussions_by_cashout, diff --git a/scripts/ci/start-api-smoketest.sh b/scripts/ci/start-api-smoketest.sh index c53195336c0ac964af93296bae996ed41c2941a0..9e0eb1d26d045a1ee04f3fd925bddcdaee85520d 100755 --- a/scripts/ci/start-api-smoketest.sh +++ b/scripts/ci/start-api-smoketest.sh @@ -5,6 +5,8 @@ pip install tox export HIVEMIND_ADDRESS=$1 export HIVEMIND_PORT=$2 +export TAVERN_DIR="tests/tests_api/hivemind/tavern" + echo "Starting tests on hivemind server running on ${HIVEMIND_ADDRESS}:${HIVEMIND_PORT}" echo "Selected test group (if empty all will be executed): $3" diff --git a/scripts/ci_start_api_smoketest.sh b/scripts/ci_start_api_smoketest.sh index d45a91d2787a3289c790d7ffb082787c8eb347e0..fb27185e9efc5be4fa2dedc1cf411bca841e44c1 100755 --- a/scripts/ci_start_api_smoketest.sh +++ b/scripts/ci_start_api_smoketest.sh @@ -5,6 +5,8 @@ pip3 install tox --user export HIVEMIND_ADDRESS=$1 export HIVEMIND_PORT=$2 +export TAVERN_DIR="tests/tests_api/hivemind/tavern" + echo Attempting to start tests on hivemind instance listeing on: $HIVEMIND_ADDRESS port: $HIVEMIND_PORT echo "Selected test group (if empty all will be executed): $3" diff --git a/scripts/run_full_sync_tests.sh b/scripts/run_full_sync_tests.sh new file mode 100755 index 0000000000000000000000000000000000000000..6ee55b47734cd6fc9019636cb1e3aff2ebab7d2f --- /dev/null +++ b/scripts/run_full_sync_tests.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# script to run tavern tests for full sync hivemind node + +export TAVERN_DIR="tests/tests_api/hivemind/tavern_full_sync" + +SCRIPT=$(readlink -f "$0") + +$(dirname "$SCRIPT")/run_tests.sh "$@" diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index a55c89e84c1ba3b60b7edee4939054fdc6fb41f4..edb8ac7a5a3d4e0b69192a571e4e67c41761b7cd 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -63,7 +63,10 @@ pip3 install tox --user export HIVEMIND_ADDRESS=$1 export HIVEMIND_PORT=$2 - +if [ -z "$TAVERN_DIR" ] +then + export TAVERN_DIR="tests/tests_api/hivemind/tavern" +fi echo "Attempting to start tests on hivemind instance listening on: $HIVEMIND_ADDRESS port: $HIVEMIND_PORT" echo "Additional test options: ${@:3}" diff --git a/tox.ini b/tox.ini index b18444609752007d4657a825fb0f2efcdd4a1c44..2ee22545322dbc69a9b390a817743a3c70c38fbc 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ passenv = HIVEMIND_ADDRESS HIVEMIND_PORT -changedir = tests/tests_api/hivemind/tavern +changedir = {env:TAVERN_DIR} deps = {[testenv]deps}