mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-15 17:32:56 +00:00
3aca717f3d
Merge batch_others and batch_pg_regress. The original idea was to split all the python tests into multiple "batches" and run each batch in parallel as a separate CI job. However, the batch_pg_regress batch was pretty short compared to all the tests in batch_others. We could split batch_others into multiple batches, but it actually seems better to just treat them as one big pool of tests and use pytest's handle the parallelism on its own. If we need to split them across multiple nodes in the future, we could use pytest-shard or something else, instead of managing the batches ourselves. Merge test_neon_regress.py, test_pg_regress.py and test_isolation.py into one file, test_pg_regress.py. Seems more clear to group all pg_regress-based tests into one file, now that they would all be in the same directory.
54 lines
1.7 KiB
Python
54 lines
1.7 KiB
Python
import os.path
|
|
import shutil
|
|
import subprocess
|
|
import time
|
|
from contextlib import closing
|
|
|
|
from cached_property import threading
|
|
from fixtures.log_helper import log
|
|
from fixtures.neon_fixtures import NeonEnv
|
|
|
|
|
|
def lsof_path() -> str:
|
|
path_output = shutil.which("lsof")
|
|
if path_output is None:
|
|
raise RuntimeError("lsof not found in PATH")
|
|
else:
|
|
return path_output
|
|
|
|
|
|
# Makes sure that `pageserver.pid` is only held by `pageserve` command, not other commands.
|
|
# This is to test the changes in https://github.com/neondatabase/neon/pull/1834.
|
|
def test_lsof_pageserver_pid(neon_simple_env: NeonEnv):
|
|
env = neon_simple_env
|
|
|
|
def start_workload():
|
|
env.neon_cli.create_branch("test_lsof_pageserver_pid")
|
|
pg = env.postgres.create_start("test_lsof_pageserver_pid")
|
|
with closing(pg.connect()) as conn:
|
|
with conn.cursor() as cur:
|
|
cur.execute("CREATE TABLE foo as SELECT x FROM generate_series(1,100000) x")
|
|
cur.execute("update foo set x=x+1")
|
|
|
|
workload_thread = threading.Thread(target=start_workload, args=(), daemon=True)
|
|
workload_thread.start()
|
|
|
|
path = os.path.join(env.repo_dir, "pageserver.pid")
|
|
lsof = lsof_path()
|
|
while workload_thread.is_alive():
|
|
res = subprocess.run(
|
|
[lsof, path],
|
|
check=False,
|
|
universal_newlines=True,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
)
|
|
|
|
# parse the `lsof` command's output to get only the list of commands
|
|
commands = [line.split(" ")[0] for line in res.stdout.strip().split("\n")[1:]]
|
|
if len(commands) > 0:
|
|
log.info(f"lsof commands: {commands}")
|
|
assert commands == ["pageserve"]
|
|
|
|
time.sleep(1.0)
|