Skip to content

Commit 538073b

Browse files
committed
Fix instance of XFAIL when running Go implementation
1 parent 3638903 commit 538073b

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ cd version-compare
9999
export SEATABLE_IMAGE=seatable/seatable-enterprise
100100
export SEATABLE_VERSION=6.0.10
101101

102-
# seatable/dtable-server-go (default) or seatable/dtable-server-js
102+
# seatable/dtable-server-go or seatable/dtable-server-js
103103
export DTABLE_SERVER_IMAGE=seatable/dtable-server-go
104104
export DTABLE_SERVER_VERSION=7.0.7-testing
105105

tests/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
from typing import Generator
1515

1616

17+
USES_GO_DTABLE_SERVER = os.environ.get('DTABLE_SERVER_IMAGE', '').endswith('dtable-server-go')
18+
19+
1720
def pytest_configure(config):
1821
config.addinivalue_line(
1922
'markers',

tests/test_columns.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from conftest import Base, base_operations_schema
2+
from conftest import Base, base_operations_schema, USES_GO_DTABLE_SERVER
33
from schemathesis import Case
44
from syrupy.assertion import SnapshotAssertion
55
from syrupy.matchers import path_type
@@ -399,6 +399,7 @@ def test_insertColumn_duplicate_name_returns_400(base: Base):
399399

400400

401401
@pytest.mark.xfail(
402+
not USES_GO_DTABLE_SERVER,
402403
reason="insertColumn returns the plain-text body 'Column ColA exists.' with an "
403404
"application/json content-type on a duplicate-column 400 (not valid JSON)",
404405
)

version-compare/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
- backend
4141

4242
dtable-server:
43-
image: ${DTABLE_SERVER_IMAGE:-seatable/dtable-server-go}:${DTABLE_SERVER_VERSION:?Variable is not set}
43+
image: ${DTABLE_SERVER_IMAGE:?Variable is not set}:${DTABLE_SERVER_VERSION:?Variable is not set}
4444
container_name: dtable-server
4545
restart: unless-stopped
4646
environment:

0 commit comments

Comments
 (0)