Skip to content

Commit 06f7419

Browse files
committed
fix: correct conditions in namespace
1 parent 60c4d13 commit 06f7419

File tree

5 files changed

+51
-3
lines changed

5 files changed

+51
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ test-integration-rebuild: ## Rebuild integration Docker services from scratch
117117
docker compose -f dev/docker-compose-integration.yml rm -f
118118
docker compose -f dev/docker-compose-integration.yml build --no-cache
119119

120-
test-integration-trino:
120+
test-integration-trino: ## Run tests marked with @pytest.mark.integration_trino
121121
sh ./dev/run-trino.sh
122122
$(TEST_RUNNER) pytest tests/ -m integration_trino $(PYTEST_ARGS)
123123

@@ -134,7 +134,7 @@ test-gcs: ## Run tests marked with @pytest.mark.gcs
134134
$(TEST_RUNNER) pytest tests/ -m gcs $(PYTEST_ARGS)
135135

136136
test-coverage: COVERAGE=1
137-
test-coverage: test test-integration test-s3 test-adls test-gcs coverage-report ## Run all tests with coverage and report
137+
test-coverage: test test-integration test-integration-trino test-s3 test-adls test-gcs coverage-report ## Run all tests with coverage and report
138138

139139
coverage-report: ## Combine and report coverage
140140
uv run $(PYTHON_ARG) coverage combine

dev/docker-compose-trino.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
services:
218
rest:
319
image: apache/iceberg-rest-fixture

dev/trino/catalog/warehouse_hive.properties

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
connector.name=iceberg
218
iceberg.catalog.type=hive_metastore
319
iceberg.expire-snapshots.min-retention=0d

dev/trino/catalog/warehouse_rest.properties

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
117
connector.name=iceberg
218
iceberg.catalog.type=rest
319
iceberg.rest-catalog.uri=http://rest:8181

tests/integration/test_rest_catalog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_schema_exists_in_trino(trino_rest_conn: Connection, catalog: RestCatalo
7575
catalog, it becomes visible as a schema in the Trino environment.
7676
"""
7777

78-
if not catalog.namespace_exists(TEST_NAMESPACE_IDENTIFIER):
78+
if catalog.namespace_exists(TEST_NAMESPACE_IDENTIFIER):
7979
catalog.drop_namespace(TEST_NAMESPACE_IDENTIFIER)
8080
catalog.create_namespace_if_not_exists(TEST_NAMESPACE_IDENTIFIER)
8181

0 commit comments

Comments
 (0)