diff --git a/CHANGES/+from_config.bugfix b/CHANGES/+from_config.bugfix new file mode 100644 index 000000000..73ae7657a --- /dev/null +++ b/CHANGES/+from_config.bugfix @@ -0,0 +1 @@ +Fixes `from_config` call that messed up the headers attribute. diff --git a/pulp-glue/pulp_glue/common/context.py b/pulp-glue/pulp_glue/common/context.py index 3dbaf0241..e29a9b027 100644 --- a/pulp-glue/pulp_glue/common/context.py +++ b/pulp-glue/pulp_glue/common/context.py @@ -344,8 +344,8 @@ def from_config(cls, config: t.Dict[str, t.Any]) -> "t.Self": if "username" in config: api_kwargs["auth_provider"] = BasicAuthProvider(config["username"], config["password"]) if "headers" in config: - api_kwargs["headers"] = ( - dict((header.split(":", maxsplit=1) for header in config["headers"])), + api_kwargs["headers"] = dict( + (header.split(":", maxsplit=1) for header in config["headers"]) ) for key in ["cert", "key", "user_agent", "cid"]: if key in config: diff --git a/pulp-glue/tests/conftest.py b/pulp-glue/tests/conftest.py index 5a79a48a5..f000fd61a 100644 --- a/pulp-glue/tests/conftest.py +++ b/pulp-glue/tests/conftest.py @@ -17,23 +17,9 @@ def pulp_ctx( request: pytest.FixtureRequest, pulp_cli_settings: t.Dict[str, t.Dict[str, t.Any]] ) -> PulpContext: verbose = request.config.getoption("verbose") - settings = pulp_cli_settings["cli"] - return PulpTestContext( - api_kwargs={ - "base_url": settings["base_url"], - "auth_provider": ( - BasicAuthProvider(settings.get("username"), settings.get("password")) - if "username" in settings - else None - ), - "cert": settings.get("cert"), - "key": settings.get("key"), - "debug_callback": lambda i, s: i <= verbose and print(s), - }, - api_root=settings.get("api_root", "pulp/"), - background_tasks=False, - timeout=settings.get("timeout", 120), - ) + settings = pulp_cli_settings["cli"].copy() + settings["debug_callback"] = lambda i, s: i <= verbose and print(s) + return PulpTestContext.from_config(settings) @pytest.fixture