diff options
Diffstat (limited to 'subplot/server.py')
| -rw-r--r-- | subplot/server.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/subplot/server.py b/subplot/server.py index 52ad8f4..2a3e397 100644 --- a/subplot/server.py +++ b/subplot/server.py @@ -33,9 +33,7 @@ def start_chunk_server(ctx, env=None): "address": f"localhost:{port}", } - server_binary = os.path.abspath( - os.path.join(srcdir, "target", "debug", "obnam-server") - ) + server_binary = ctx["server-binary"] filename = "config.yaml" yaml.safe_dump(config, stream=open(filename, "w")) @@ -44,8 +42,7 @@ def start_chunk_server(ctx, env=None): ctx["server_url"] = f"https://{config['address']}" daemon_start_on_port( - ctx, name="obnam-server", path=server_binary, args=filename, port=port, - env=env + ctx, name="obnam-server", path=server_binary, args=filename, port=port, env=env ) @@ -202,6 +199,7 @@ def _expand_vars(ctx, s): s = s[m.end() :] return "".join(result) + def _server_stderr_contains(ctx, wanted): daemon_get_stderr = globals()["daemon_get_stderr"] |