Skip to content

Commit

Permalink
Revert "[5.x] Skip *all* the start_edgedb_server tests on x86 MacOS (#…
Browse files Browse the repository at this point in the history
…7246)"

This reverts commit d5b1974.
  • Loading branch information
msullivan committed Apr 25, 2024
1 parent 5983416 commit 01aedd3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 0 additions & 7 deletions edb/testbase/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import json
import os
import pathlib
import platform
import random
import re
import secrets
Expand Down Expand Up @@ -2460,12 +2459,6 @@ def start_edgedb_server(
extra_args: Optional[List[str]] = None,
default_branch: Optional[str] = None,
):
if platform.system() == "Darwin" and platform.machine() == 'x86_64':
raise unittest.SkipTest(
"Postgres is not getting getting enough shared memory on macos-14 "
"GitHub runner by default"
)

if not devmode.is_in_dev_mode() and not runstate_dir:
if backend_dsn or adjacent_to:
# We don't want to implicitly "fix the issue" for the test author
Expand Down
6 changes: 6 additions & 0 deletions tests/test_server_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import asyncio
import os
import pathlib
import platform
import signal
import ssl
import tempfile
Expand Down Expand Up @@ -677,6 +678,11 @@ async def test_server_auth_in_transaction(self):
DROP ROLE foo;
''')

@unittest.skipIf(
platform.system() == "Darwin" and platform.machine() == 'x86_64',
"Postgres is not getting getting enough shared memory on macos-14 "
"GitHub runner by default"
)
@unittest.skipIf(
"EDGEDB_SERVER_MULTITENANT_CONFIG_FILE" in os.environ,
"cannot use CONFIGURE INSTANCE in multi-tenant mode",
Expand Down

0 comments on commit 01aedd3

Please sign in to comment.