Skip to content

Commit 0811901

Browse files
committed
test file fixes
1 parent badb8e6 commit 0811901

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

metadata-ingestion/tests/integration/airbyte/airbyte_test_setup.py

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def wait_for_airbyte_ready(timeout: int = 600) -> bool:
260260
time.sleep(45)
261261

262262
if check_airbyte_pods_ready():
263-
print("SUCCESS: Airbyte pods ready")
263+
print("Airbyte pods ready")
264264

265265
end_time = time.time() + timeout
266266
check_interval = 15
@@ -287,7 +287,7 @@ def wait_for_airbyte_ready(timeout: int = 600) -> bool:
287287
)
288288

289289
if workspaces_response.status_code == 200:
290-
print("SUCCESS: Airbyte API ready")
290+
print("Airbyte API ready")
291291
return True
292292

293293
except requests.RequestException:
@@ -422,9 +422,7 @@ def update_airbyte_database_id(
422422
)
423423

424424
if result.returncode == 0:
425-
print(f"SUCCESS: Successfully updated {table_name} ID")
426-
if result.stdout:
427-
print(f" Output: {result.stdout.strip()}")
425+
print(f"Updated {table_name} ID")
428426
return True
429427
else:
430428
print(f"WARNING: Failed to update {table_name} ID: {result.stderr}")
@@ -468,7 +466,7 @@ def try_direct_api_setup() -> Optional[str]:
468466
)
469467
if workspaces:
470468
workspace_id = workspaces[0].get("workspaceId")
471-
print(f"SUCCESS: Workspace ID: {workspace_id}")
469+
print(f"Workspace ID: {workspace_id}")
472470
set_airbyte_api_url(api_url)
473471
return workspace_id
474472
else:
@@ -481,7 +479,7 @@ def try_direct_api_setup() -> Optional[str]:
481479
workspaces = workspaces_data.get("workspaces", [])
482480
if workspaces:
483481
workspace_id = workspaces[0].get("workspaceId")
484-
print(f"SUCCESS: Workspace ID: {workspace_id}")
482+
print(f"Workspace ID: {workspace_id}")
485483
set_airbyte_api_url(api_url)
486484
return workspace_id
487485

@@ -496,7 +494,7 @@ def try_direct_api_setup() -> Optional[str]:
496494

497495
def create_airbyte_test_setup(workspace_id: str) -> Dict[str, Optional[str]]:
498496
"""Create PostgreSQL and MySQL sources, PostgreSQL destination, and connections."""
499-
print(f"Creating Airbyte resources for workspace {workspace_id}...")
497+
print("Creating Airbyte resources...")
500498

501499
created_ids: Dict[str, Optional[str]] = {
502500
"workspace_id": workspace_id,
@@ -632,7 +630,6 @@ def create_airbyte_test_setup(workspace_id: str) -> Dict[str, Optional[str]]:
632630
return created_ids
633631

634632
# Create PostgreSQL destination
635-
print("Creating PostgreSQL destination...")
636633
postgres_dest_config = {
637634
"name": "Test Postgres Destination",
638635
"destinationDefinitionId": postgres_dest_def_id,
@@ -679,12 +676,7 @@ def create_airbyte_test_setup(workspace_id: str) -> Dict[str, Optional[str]]:
679676
# Trigger sync jobs
680677
_trigger_sync_jobs(api_url, auth, created_ids)
681678

682-
print(
683-
"\nSUCCESS: SUCCESS: All Airbyte sources, destinations, and connections created!"
684-
)
685-
print(f"PostgreSQL Source ID: {postgres_source_id}")
686-
print(f"MySQL Source ID: {mysql_source_id}")
687-
print(f"PostgreSQL Destination ID: {postgres_dest_id}")
679+
print("All Airbyte resources created")
688680

689681
return created_ids
690682

@@ -698,7 +690,6 @@ def _discover_schema(
698690
api_url: str, auth: tuple, source_id: str, source_name: str
699691
) -> Optional[Dict]:
700692
"""Discover schema for a source with retries."""
701-
print(f"Discovering {source_name} schema...")
702693
discover_payload = {"sourceId": source_id}
703694

704695
for attempt in range(3):
@@ -803,8 +794,6 @@ def _create_mysql_connection(
803794

804795
def _trigger_sync_jobs(api_url: str, auth: tuple, created_ids: Dict) -> None:
805796
"""Trigger sync jobs for connections."""
806-
print("Triggering sync jobs...")
807-
808797
for conn_key, conn_name in [
809798
("pg_to_pg_connection_id", "Postgres-to-Postgres"),
810799
("mysql_to_pg_connection_id", "MySQL-to-Postgres"),
@@ -1153,7 +1142,7 @@ def get_airbyte_credentials(abctl_path: Path, test_resources_dir: Path) -> None:
11531142
client_secret = re.sub(r"\x1b\[[0-9;]*m", "", client_secret)
11541143

11551144
if password:
1156-
print("SUCCESS: Retrieved Airbyte credentials")
1145+
print("Retrieved Airbyte credentials")
11571146
os.environ["AIRBYTE_PASSWORD"] = password
11581147
if client_id:
11591148
os.environ["AIRBYTE_CLIENT_ID"] = client_id
@@ -1200,7 +1189,7 @@ def complete_airbyte_onboarding() -> bool:
12001189
)
12011190

12021191
if response.status_code in [200, 201]:
1203-
print("SUCCESS: Onboarding setup completed programmatically")
1192+
print("Onboarding completed")
12041193
return True
12051194
else:
12061195
print(f"Onboarding setup returned {response.status_code}")

metadata-ingestion/tests/integration/airbyte/test_airbyte.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ def airbyte_service(
111111
"install",
112112
"--port",
113113
str(AIRBYTE_API_PORT),
114-
"--low-resource-mode",
115114
"--no-browser",
115+
"--insecure-cookies",
116116
]
117117

118118
try:
@@ -133,13 +133,13 @@ def airbyte_service(
133133
except subprocess.TimeoutExpired as e:
134134
raise RuntimeError("abctl install timed out") from e
135135

136+
# Get credentials BEFORE waiting for API (needed for authentication)
137+
get_airbyte_credentials(abctl_path, test_resources_dir)
138+
136139
# Wait for Airbyte to be ready
137140
if not wait_for_airbyte_ready(timeout=600):
138141
raise RuntimeError("Airbyte failed to become ready")
139142

140-
# Get credentials
141-
get_airbyte_credentials(abctl_path, test_resources_dir)
142-
143143
# Complete onboarding
144144
complete_airbyte_onboarding()
145145

0 commit comments

Comments
 (0)