jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix io tests not collecting coverage data when using run()

Browse Source 
Before, postgrest was killed after each test and no coverage data was saved.
Now the process is terminated gracefully via SIGTERM first to allow writing the .tix file.
This commit is contained in:
Wolfgang Walther
2020-12-30 14:51:58 +01:00
committed by Remo Rechkemmer
parent c7f0d42323
commit 568477b6af
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/tests.nix
+5 -3
View File
@@ -184,8 +184,10 @@ let
# temporary directory to collect data in # temporary directory to collect data in
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
# we keep the tmpdir when an error occurs for debugging and only remove it on success # we keep the tmpdir when an error occurs for debugging
trap 'echo Temporary directory kept at: $tmpdir' ERR SIGINT SIGTERM trap 'echo Temporary directory kept at: $tmpdir' ERR
# remove the tmpdir when cancelled (postgrest-watch)
trap 'rm -rf "$tmpdir"' SIGINT SIGTERM
# build once before running all the tests # build once before running all the tests
${cabal-install}/bin/cabal v2-build ${devCabalOptions} --enable-tests all ${cabal-install}/bin/cabal v2-build ${devCabalOptions} --enable-tests all
@@ -199,7 +201,7 @@ let
${withTmpDb postgresql} ${cabal-install}/bin/cabal v2-test ${devCabalOptions} ${withTmpDb postgresql} ${cabal-install}/bin/cabal v2-test ${devCabalOptions}
# collect all the tix files # collect all the tix files
${ghc}/bin/hpc sum --union --exclude=Paths_postgrest --output="$tmpdir"/tests.tix "$tmpdir"/io.tix "$tmpdir"/spec.tix ${ghc}/bin/hpc sum --union --exclude=Paths_postgrest --output="$tmpdir"/tests.tix "$tmpdir"/io*.tix "$tmpdir"/spec.tix
# prepare the overlay # prepare the overlay
${ghc}/bin/hpc overlay --output="$tmpdir"/overlay.tix test/coverage.overlay ${ghc}/bin/hpc overlay --output="$tmpdir"/overlay.tix test/coverage.overlay
test/io-tests/test_io.py
+19 -5
View File
@@ -73,12 +73,22 @@ def defaultenv():
} }
def hpctixfile():
"Returns an individual filename for each test, if the HPCTIXFILE environment variable is set."
if "HPCTIXFILE" not in os.environ:
return ""
tixfile = pathlib.Path(os.environ["HPCTIXFILE"])
test = hash(os.environ["PYTEST_CURRENT_TEST"])
return tixfile.with_suffix(f".{test}.tix")
def dumpconfig(configpath=None, env=None, stdin=None): def dumpconfig(configpath=None, env=None, stdin=None):
"Dump the config as parsed by PostgREST." "Dump the config as parsed by PostgREST."
env = env or {} env = env or {}
command = [POSTGREST_BIN, "--dump-config"] command = [POSTGREST_BIN, "--dump-config"]
env["HPCTIXFILE"] = os.getenv("HPCTIXFILE", "") env["HPCTIXFILE"] = hpctixfile()
if configpath: if configpath:
command.append(configpath) command.append(configpath)
@@ -88,7 +98,7 @@ def dumpconfig(configpath=None, env=None, stdin=None):
) )
process.stdin.write(stdin or b"") process.stdin.write(stdin or b"")
result = process.communicate()[0] result = process.communicate(timeout=5)[0]
process.kill() process.kill()
process.wait() process.wait()
if process.returncode != 0: if process.returncode != 0:
@@ -112,7 +122,7 @@ def run(configpath=None, stdin=None, env=None, port=None):
baseurl = "http+unix://" + urllib.parse.quote_plus(str(socketfile)) baseurl = "http+unix://" + urllib.parse.quote_plus(str(socketfile))
command = [POSTGREST_BIN] command = [POSTGREST_BIN]
env["HPCTIXFILE"] = os.getenv("HPCTIXFILE", "") env["HPCTIXFILE"] = hpctixfile()
if configpath: if configpath:
command.append(configpath) command.append(configpath)
@@ -127,8 +137,12 @@ def run(configpath=None, stdin=None, env=None, port=None):
yield PostgrestProcess(process=process, session=PostgrestSession(baseurl)) yield PostgrestProcess(process=process, session=PostgrestSession(baseurl))
finally: finally:
process.kill() process.terminate()
process.wait() try:
process.wait(timeout=1)
except:
process.kill()
process.wait()
def freeport(): def freeport():