Refactor disc prov test structure (#2108)

discovery-provider/.vscode/settings.json

@@ -15,9 +15,10 @@
   "python.languageServer": "Pylance",
   "editor.tabSize": 4,
   "python.testing.pytestArgs": [
-    "tests"
+    "src",
+    "integration_tests"
   ],
   "python.testing.unittestEnabled": false,
   "python.testing.nosetestsEnabled": false,
   "python.testing.pytestEnabled": true
-}
+}

discovery-provider/tests/test_challenges.py → discovery-provider/integration_tests/challenges/test_challenges.py

@@ -4,8 +4,8 @@
 from sqlalchemy.orm.session import Session
 import redis
 
-from tests.test_get_challenges import DefaultUpdater
-from tests.utils import populate_mock_db_blocks
+from integration_tests.queries.test_get_challenges import DefaultUpdater
+from integration_tests.utils import populate_mock_db_blocks
 
 from src.models.models import Block
 from src.models import Challenge, UserChallenge, ChallengeType

discovery-provider/tests/test_trending_challenge.py → discovery-provider/integration_tests/challenges/test_trending_challenge.py

@@ -18,7 +18,7 @@
 from src.tasks.calculate_trending_challenges import enqueue_trending_challenges
 from src.tasks.index_aggregate_plays import _update_aggregate_plays
 from src.trending_strategies.trending_strategy_factory import TrendingStrategyFactory
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 REDIS_URL = shared_config["redis"]["url"]
 logger = logging.getLogger(__name__)

discovery-provider/tests/test_model_validator.py → discovery-provider/integration_tests/models/test_model_validator.py

@@ -73,7 +73,7 @@ def test_schema_missing():
 
 
 def test_schema_invalid_json():
-    ModelValidator.BASE_PATH = "./tests/res/"
+    ModelValidator.BASE_PATH = "./integration_tests/res/"
     try:
         ModelValidator.validate(to_validate={}, field="title", model="bad")
         assert False, "test_model_validator [test_schema_invalid_json] failed"
@@ -82,7 +82,7 @@ def test_schema_invalid_json():
 
 
 def test_schema_missing_model_key():
-    ModelValidator.BASE_PATH = "./tests/res/"
+    ModelValidator.BASE_PATH = "./integration_tests/res/"
 
     try:
         ModelValidator.validate(to_validate={}, field="title", model="user_bad")

discovery-provider/tests/test_track_tag_mat_view.py → discovery-provider/integration_tests/models/test_track_tag_mat_view.py

@@ -2,7 +2,7 @@
 
 from src.models import TagTrackUserMatview
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def test_track_tag_mat_view(app):

discovery-provider/tests/test_get_attestation.py → discovery-provider/integration_tests/queries/test_get_attestation.py

@@ -19,7 +19,7 @@
 from src.utils.config import shared_config
 from src.tasks.index_oracles import oracle_addresses_key
 
-from tests.test_get_challenges import setup_db
+from integration_tests.queries.test_get_challenges import setup_db
 
 REDIS_URL = shared_config["redis"]["url"]
 redis_handle = redis.Redis.from_url(url=REDIS_URL)

discovery-provider/tests/test_get_history_for_user.py → discovery-provider/integration_tests/queries/test_get_history_for_user.py

@@ -1,6 +1,6 @@
 from src.queries.get_track_history import _get_track_history
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 test_entities = {
     "plays": [

discovery-provider/tests/test_get_related_artists.py → discovery-provider/integration_tests/queries/test_get_related_artists.py

@@ -9,7 +9,7 @@
 )
 from src.utils.db_session import get_db
 
-from .utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 entities = {

discovery-provider/tests/test_get_repost_feed_for_user.py → discovery-provider/integration_tests/queries/test_get_repost_feed_for_user.py

@@ -1,6 +1,6 @@
 from src.queries.get_repost_feed_for_user import _get_repost_feed_for_user
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def test_get_repost_feed_for_user(app):

discovery-provider/tests/test_get_top_user_track_tags.py → discovery-provider/integration_tests/queries/test_get_top_user_track_tags.py

@@ -1,6 +1,6 @@
 from src.queries.get_top_user_track_tags import _get_top_user_track_tags
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def test_get_top_user_track_tags(app):

discovery-provider/tests/test_get_tracks.py → discovery-provider/integration_tests/queries/test_get_tracks.py

@@ -4,7 +4,7 @@
 from src.queries.get_tracks import _get_tracks
 from src.utils.db_session import get_db
 
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def populate_tracks(db):

discovery-provider/tests/test_get_user_signals.py → discovery-provider/integration_tests/queries/test_get_user_signals.py

@@ -1,6 +1,6 @@
 from src.queries.get_user_signals import _get_user_signals
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def make_user(

discovery-provider/tests/test_populate_playlist_metadata.py → discovery-provider/integration_tests/queries/test_populate_playlist_metadata.py

@@ -3,7 +3,7 @@
 from src.models import RepostType, SaveType
 from src.queries.query_helpers import populate_playlist_metadata
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 logger = logging.getLogger(__name__)
 

discovery-provider/tests/test_populate_track_metadata.py → discovery-provider/integration_tests/queries/test_populate_track_metadata.py

@@ -2,7 +2,7 @@
 from src.queries import response_name_constants
 from src.queries.query_helpers import populate_track_metadata
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 logger = logging.getLogger(__name__)
 

discovery-provider/tests/test_populate_user_metadata.py → discovery-provider/integration_tests/queries/test_populate_user_metadata.py

@@ -2,7 +2,7 @@
 from src.queries import response_name_constants
 from src.queries.query_helpers import populate_user_metadata
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 logger = logging.getLogger(__name__)
 

discovery-provider/tests/test_search_track_tags.py → discovery-provider/integration_tests/queries/test_search_track_tags.py

@@ -1,7 +1,7 @@
 from src.queries.search_track_tags import search_track_tags
 from src.utils.db_session import get_db
 from src.tasks.index_aggregate_plays import _update_aggregate_plays
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def test_search_track_tags(app):

discovery-provider/tests/test_search_user_tags.py → discovery-provider/integration_tests/queries/test_search_user_tags.py

@@ -1,6 +1,6 @@
 from src.queries.search_user_tags import search_user_tags
 from src.utils.db_session import get_db
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 
 def test_search_user_tags(app):

discovery-provider/tests/test_undisbursed_challeges.py → discovery-provider/integration_tests/queries/test_undisbursed_challeges.py

@@ -2,7 +2,7 @@
 from src.models import Challenge, UserChallenge, ChallengeType, User
 from src.utils.db_session import get_db
 from src.queries.get_undisbursed_challenges import get_undisbursed_challenges
-from tests.utils import populate_mock_db_blocks
+from integration_tests.utils import populate_mock_db_blocks
 
 
 def setup_challenges(app):

discovery-provider/tests/test_index_aggregate_plays.py → discovery-provider/integration_tests/tasks/test_index_aggregate_plays.py

@@ -6,7 +6,7 @@
 from src.models import AggregatePlays
 from src.utils.config import shared_config
 from src.utils.db_session import get_db
-from .utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 REDIS_URL = shared_config["redis"]["url"]
 

discovery-provider/tests/test_index_listen_count_milestone.py → discovery-provider/integration_tests/tasks/test_index_listen_count_milestone.py

@@ -13,7 +13,7 @@
 from src.utils.config import shared_config
 from src.utils.redis_cache import set_json_cached_key
 from src.tasks.index_aggregate_plays import _update_aggregate_plays
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 REDIS_URL = shared_config["redis"]["url"]
 DEFAULT_EVENT = ""

discovery-provider/tests/test_index_playlists.py → discovery-provider/integration_tests/tasks/test_index_playlists.py

@@ -6,7 +6,7 @@
 from src.utils.playlist_event_constants import playlist_event_types_lookup
 from src.utils import helpers
 from src.challenges.challenge_event_bus import setup_challenge_bus
-from tests.index_helpers import AttrDict, IPFSClient, UpdateTask
+from integration_tests.challenges.index_helpers import AttrDict, IPFSClient, UpdateTask
 
 block_hash = b"0x8f19da326900d171642af08e6770eedd83509c6c44f6855c98e6a752844e2521"
 

discovery-provider/tests/test_index_related_artists.py → discovery-provider/integration_tests/tasks/test_index_related_artists.py

@@ -13,7 +13,7 @@
 from src.utils.config import shared_config
 from src.utils.db_session import get_db
 
-from .utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 REDIS_URL = shared_config["redis"]["url"]
 

discovery-provider/tests/test_index_rewards_manager.py → discovery-provider/integration_tests/tasks/test_index_rewards_manager.py

@@ -11,7 +11,7 @@
 from src.utils.redis_connection import get_redis
 from src.solana.solana_client_manager import SolanaClientManager
 
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 REWARDS_MANAGER_PROGRAM = shared_config["solana"]["rewards_manager_program_address"]
 REWARDS_MANAGER_ACCOUNT = shared_config["solana"]["rewards_manager_account"]

discovery-provider/tests/test_index_tracks.py → discovery-provider/integration_tests/tasks/test_index_tracks.py

@@ -12,7 +12,7 @@
 from src.utils import helpers
 from src.utils.db_session import get_db
 from src.challenges.challenge_event_bus import ChallengeEventBus, setup_challenge_bus
-from tests.index_helpers import AttrDict, IPFSClient, UpdateTask
+from integration_tests.challenges.index_helpers import AttrDict, IPFSClient, UpdateTask
 
 block_hash = b"0x8f19da326900d171642af08e6770eedd83509c6c44f6855c98e6a752844e2521"
 

discovery-provider/tests/test_index_user_listening_history.py → discovery-provider/integration_tests/tasks/test_index_user_listening_history.py

@@ -8,7 +8,7 @@
 )
 from src.utils.config import shared_config
 from src.utils.db_session import get_db
-from .utils import populate_mock_db
+from integration_tests.utils.utils import populate_mock_db
 
 REDIS_URL = shared_config["redis"]["url"]
 

discovery-provider/tests/test_index_users.py → discovery-provider/integration_tests/tasks/test_index_users.py

@@ -11,7 +11,7 @@
 from src.utils.redis_connection import get_redis
 from src.utils.user_event_constants import user_event_types_lookup
 
-from tests.index_helpers import AttrDict, IPFSClient
+from integration_tests.challenges.index_helpers import AttrDict, IPFSClient
 
 block_hash = b"0x8f19da326900d171642af08e6770eedd83509c6c44f6855c98e6a752844e2521"
 

discovery-provider/tests/test_update_trending.py → discovery-provider/integration_tests/tasks/test_update_trending.py

@@ -7,7 +7,7 @@
     TrendingTracksStrategyaSPET,
 )
 from src.tasks.index_aggregate_plays import _update_aggregate_plays
-from tests.utils import populate_mock_db
+from integration_tests.utils import populate_mock_db
 
 logger = logging.getLogger(__name__)
 

discovery-provider/tests/test_index_operations.py → discovery-provider/integration_tests/utils/test_index_operations.py

@@ -6,17 +6,17 @@
 
 import src.utils.multihash
 from src.utils.helpers import remove_test_file
-from tests.utils import query_creator_by_name, to_bytes
+from integration_tests.utils import query_creator_by_name, to_bytes
 
 
 @pytest.mark.skip(
     reason="user contract functions changed, skipping now to unblock dependent work until fixed"
 )
 def test_index_operations(app, client, celery_app, contracts):
     """Confirm indexing of creator operations results in expected state change"""
-    test_file = "tests/res/test_audio_file.mp3"
-    creator_metadata_json_file = "tests/res/test_creator_metadata.json"
-    track_metadata_json_file = "tests/res/test_track_metadata.json"
+    test_file = "integration_tests/res/test_audio_file.mp3"
+    creator_metadata_json_file = "integration_tests/res/test_creator_metadata.json"
+    track_metadata_json_file = "integration_tests/res/test_track_metadata.json"
 
     user_factory_contract = contracts["user_factory_contract"]
     track_factory_contract = contracts["track_factory_contract"]

discovery-provider/tests/test_ipfs_functionality.py → discovery-provider/integration_tests/utils/test_ipfs_functionality.py

@@ -10,7 +10,7 @@
 
 IPFS_FETCH = 'get_metadata_from_ipfs_node'
 GATEWAY_FETCH = 'get_metadata_from_gateway'
-JSON_FILE = "tests/res/test_ipfs.json"
+JSON_FILE = "integration_tests/res/test_ipfs.json"
 
 # Helpers
 def get_ipfs_client(app):

discovery-provider/scripts/lint.sh

@@ -1,5 +1,5 @@
 set -e
 
 pylint src/
-pylint tests/
+pylint integration_tests/
 mypy --ignore-missing-imports --follow-imports=silent --show-column-numbers src/

discovery-provider/scripts/test.sh

@@ -71,4 +71,4 @@ sleep 5
 pytest src
 
 # Integration tests
-pytest tests
+pytest integration_tests

discovery-provider/src/queries/get_app_name_metrics_unit_test.py

@@ -0,0 +1,2 @@
+def test():
+    """See /integration_tests/test_get_app_name_metrics.py"""

discovery-provider/src/queries/get_genre_metrics_unit_test.py

@@ -0,0 +1,2 @@
+def test():
+    """See /integration_tests/test_get_genre_metrics.py"""

discovery-provider/src/queries/get_plays_metrics_unit_test.py

@@ -0,0 +1,2 @@
+def test():
+    """See /integration_tests/test_get_plays_metrics.py"""

discovery-provider/src/queries/get_route_metrics_unit_test.py

@@ -0,0 +1,2 @@
+def test():
+    """See /integration_tests/test_get_route_metrics.py"""