Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/cloudtest/test_full_testdrive.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import pytest

from materialize import buildkite
from materialize import MZ_ROOT, buildkite
from materialize.cloudtest.app.materialize_application import MaterializeApplication


Expand All @@ -24,7 +24,9 @@ def test_full_testdrive(mz: MaterializeApplication) -> None:
parser.add_argument("--file-pattern", default="*.td", type=str)
args, _ = parser.parse_known_args()

matching_files = glob.glob(f"testdrive/{args.file_pattern}", root_dir="test")
matching_files = glob.glob(
f"testdrive/{args.file_pattern}", root_dir=MZ_ROOT / "test"
)

# TODO: database-issues#7827 (test requires fivetran running in cloudtest)
matching_files.remove("testdrive/fivetran-destination.td")
Expand Down
10 changes: 7 additions & 3 deletions test/mysql-cdc-old-syntax/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import threading
from textwrap import dedent

from materialize import buildkite
from materialize import MZ_ROOT, buildkite
from materialize.mysql_util import (
retrieve_invalid_ssl_context_for_mysql,
retrieve_ssl_context_for_mysql,
Expand Down Expand Up @@ -112,7 +112,9 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:

matching_files = []
for filter in args.filter:
matching_files.extend(glob.glob(filter, root_dir="test/mysql-cdc-old-syntax"))
matching_files.extend(
glob.glob(filter, root_dir=MZ_ROOT / "test" / "mysql-cdc-old-syntax")
)
sharded_files: list[str] = sorted(
buildkite.shard_list(matching_files, lambda file: file)
)
Expand Down Expand Up @@ -299,7 +301,9 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:

matching_files = []
for filter in args.filter:
matching_files.extend(glob.glob(filter, root_dir="test/mysql-cdc-old-syntax"))
matching_files.extend(
glob.glob(filter, root_dir=MZ_ROOT / "test" / "mysql-cdc-old-syntax")
)

sharded_files: list[str] = sorted(
buildkite.shard_list(matching_files, lambda file: file)
Expand Down
10 changes: 7 additions & 3 deletions test/pg-cdc-old-syntax/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import pg8000
from pg8000 import Connection

from materialize import buildkite
from materialize import MZ_ROOT, buildkite
from materialize.mzcompose.composition import Composition, WorkflowArgumentParser
from materialize.mzcompose.service import Service, ServiceConfig
from materialize.mzcompose.services.materialized import Materialized
Expand Down Expand Up @@ -303,7 +303,9 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:

matching_files = []
for filter in args.filter:
matching_files.extend(glob.glob(filter, root_dir="test/pg-cdc-old-syntax"))
matching_files.extend(
glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc-old-syntax")
)
sharded_files: list[str] = sorted(
buildkite.shard_list(matching_files, lambda file: file)
)
Expand Down Expand Up @@ -378,7 +380,9 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:

matching_files = []
for filter in args.filter:
matching_files.extend(glob.glob(filter, root_dir="test/pg-cdc-old-syntax"))
matching_files.extend(
glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc-old-syntax")
)
sharded_files: list[str] = sorted(
buildkite.shard_list(matching_files, lambda file: file)
)
Expand Down
4 changes: 2 additions & 2 deletions test/pg-cdc/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import psycopg
from psycopg import Connection

from materialize import buildkite
from materialize import MZ_ROOT, buildkite
from materialize.mzcompose.composition import Composition, WorkflowArgumentParser
from materialize.mzcompose.service import Service, ServiceConfig
from materialize.mzcompose.services.materialized import Materialized
Expand Down Expand Up @@ -291,7 +291,7 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:

matching_files = []
for filter in args.filter:
matching_files.extend(glob.glob(filter, root_dir="test/pg-cdc"))
matching_files.extend(glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc"))
sharded_files: list[str] = sorted(
buildkite.shard_list(matching_files, lambda file: file)
)
Expand Down
6 changes: 4 additions & 2 deletions test/testdrive-old-kafka-src-syntax/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import glob
from pathlib import Path

from materialize import ci_util, spawn
from materialize import MZ_ROOT, ci_util, spawn
from materialize.mzcompose import get_default_system_parameters
from materialize.mzcompose.composition import Composition, WorkflowArgumentParser
from materialize.mzcompose.services.azure import Azurite
Expand Down Expand Up @@ -304,7 +304,9 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:
matching_files = []
for filter in args.files:
matching_files.extend(
glob.glob(filter, root_dir="test/testdrive-old-kafka-src-syntax")
glob.glob(
filter, root_dir=MZ_ROOT / "test" / "testdrive-old-kafka-src-syntax"
)
)
matching_files = [file for file in matching_files if file != "session.td"]

Expand Down