Skip to content

Commit

Permalink
Fix style.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimf5 committed May 10, 2024
1 parent 6e00af6 commit be0f48e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
14 changes: 3 additions & 11 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"otelcol_fixtures",
]

NGINX_BINARY = os.getenv("TEST_NGINX_BINARY", "../nginx/objs/nginx")
NGINX = os.getenv("TEST_NGINX_BINARY", "../nginx/objs/nginx")
CAPABILITIES = subprocess.check_output(
[NGINX_BINARY, "-V"], stderr=subprocess.STDOUT
[NGINX, "-V"], stderr=subprocess.STDOUT
).decode("utf-8")


Expand Down Expand Up @@ -70,15 +70,7 @@ def nginx(testdir, nginx_config, _certs, logger):
(testdir / "nginx.conf").write_text(nginx_config)
logger.info("Starting nginx...")
proc = subprocess.Popen(
[
NGINX_BINARY,
"-p",
str(testdir),
"-c",
"nginx.conf",
"-e",
"error.log",
]
[NGINX, "-p", str(testdir), "-c", "nginx.conf", "-e", "error.log"]
)
logger.debug(f"args={' '.join(proc.args)}")
logger.debug(f"pid={proc.pid}")
Expand Down
6 changes: 1 addition & 5 deletions tests/test_otel.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,7 @@ def _otelcol(testdir, logger):
)
logger.info("Starting otelcol at 127.0.0.1:8317...")
proc = subprocess.Popen(
[
"../otelcol",
"--config",
testdir / "otel-config.yaml",
]
["../otelcol", "--config", testdir / "otel-config.yaml"]
)
if proc.poll() is not None:
raise subprocess.SubprocessError("Can't start otelcol")
Expand Down

0 comments on commit be0f48e

Please sign in to comment.