From 2942730a2c789467b026c2306cce41e0dc8d93fe Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Wed, 12 Mar 2025 17:08:17 +0100 Subject: [PATCH 1/3] Updated test to local data center cluster --- test/integration/connectors/test_jira.py | 28 +++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/test/integration/connectors/test_jira.py b/test/integration/connectors/test_jira.py index e5f38e14c..635c467ab 100644 --- a/test/integration/connectors/test_jira.py +++ b/test/integration/connectors/test_jira.py @@ -1,7 +1,5 @@ import os - import pytest - from test.integration.connectors.utils.constants import SOURCE_TAG, UNCATEGORIZED_TAG from test.integration.connectors.utils.validation.source import ( SourceValidationConfigs, @@ -21,23 +19,22 @@ @pytest.mark.asyncio @pytest.mark.tags(CONNECTOR_TYPE, SOURCE_TAG, UNCATEGORIZED_TAG) -@requires_env("JIRA_INGEST_USER_EMAIL", "JIRA_INGEST_API_TOKEN") +@requires_env("JIRA_DC_URL", "JIRA_DC_PAT") async def test_jira_source(temp_dir): # Retrieve environment variables - jira_url = os.environ.get( - "JIRA_INGEST_URL", "https://unstructured-jira-connector-test.atlassian.net" - ) - user_email = os.environ["JIRA_INGEST_USER_EMAIL"] - api_token = os.environ["JIRA_INGEST_API_TOKEN"] - projects = ["JCTP1"] - boards = ["3"] - issues = ["JCTP2-1", "JCTP2-2", "JCTP2-3"] + jira_url = os.environ.get("JIRA_DC_URL", "http://localhost:8080") # Default to local Jira DC + pat_token = os.environ["JIRA_DC_PAT"] + + # Update these values to match your local Jira sample project + projects = ["sample_project"] + boards = ["1"] + issues = ["SAM-1", "SAM-2"] # Create connection and indexer configurations - access_config = JiraAccessConfig(password=api_token) + access_config = JiraAccessConfig(token=pat_token) connection_config = JiraConnectionConfig( url=jira_url, - username=user_email, + cloud=False, # Ensure we're using Jira Data Center access_config=access_config, ) index_config = JiraIndexerConfig(projects=projects, boards=boards, issues=issues) @@ -59,8 +56,9 @@ async def test_jira_source(temp_dir): indexer=indexer, downloader=downloader, configs=SourceValidationConfigs( - test_id="jira", - expected_num_files=8, + test_id="jira_dc", + overwrite_fixutres=True, + expected_num_files=7, validate_file_data=True, validate_downloaded_files=True, ), From ea4802932a9af3f35d3cd884f4a7a01f5485ac8c Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Wed, 12 Mar 2025 18:25:39 +0100 Subject: [PATCH 2/3] Small cleanup --- test/integration/connectors/test_jira.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/connectors/test_jira.py b/test/integration/connectors/test_jira.py index 635c467ab..e0bcf3c83 100644 --- a/test/integration/connectors/test_jira.py +++ b/test/integration/connectors/test_jira.py @@ -41,7 +41,6 @@ async def test_jira_source(temp_dir): download_config = JiraDownloaderConfig(download_dir=temp_dir) - # Instantiate indexer and downloader indexer = JiraIndexer( connection_config=connection_config, index_config=index_config, @@ -51,7 +50,6 @@ async def test_jira_source(temp_dir): download_config=download_config, ) - # Run the source connector validation await source_connector_validation( indexer=indexer, downloader=downloader, From d0dedb0ce69902eabb9301341964b239ba328b99 Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 09:10:37 +0100 Subject: [PATCH 3/3] Update number of fixture files --- test/integration/connectors/test_jira.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/connectors/test_jira.py b/test/integration/connectors/test_jira.py index e0bcf3c83..9e025a070 100644 --- a/test/integration/connectors/test_jira.py +++ b/test/integration/connectors/test_jira.py @@ -55,8 +55,8 @@ async def test_jira_source(temp_dir): downloader=downloader, configs=SourceValidationConfigs( test_id="jira_dc", - overwrite_fixutres=True, - expected_num_files=7, + overwrite_fixtures=True, + expected_num_files=23, validate_file_data=True, validate_downloaded_files=True, ),