@@ -373,6 +373,29 @@ def test_include_beta(clean_x_glean_env, beta_env, experimental_env, config, exp
373373 assert "X-Glean-Beta" not in result .headers
374374
375375
376+ def send_query (** kwargs ) -> httpx .Request :
377+ """Send one request through a real Glean client and return what went out."""
378+ captured = []
379+
380+ def handler (request : httpx .Request ) -> httpx .Response :
381+ captured .append (request )
382+ return httpx .Response (200 , json = {})
383+
384+ glean = Glean (
385+ api_token = "test-token" ,
386+ server_url = "https://example.com" ,
387+ client = httpx .Client (transport = httpx .MockTransport (handler )),
388+ ** kwargs ,
389+ )
390+ try :
391+ glean .search .query (query = "test" )
392+ except Exception : # pylint: disable=broad-exception-caught
393+ pass # The empty response body may not validate; only the request matters.
394+
395+ assert captured , "expected a request to be sent"
396+ return captured [0 ]
397+
398+
376399@pytest .mark .parametrize (
377400 "env, expected" ,
378401 [
@@ -393,25 +416,63 @@ def test_sdk_sends_include_experimental_header(clean_x_glean_env, env, expected)
393416 for name , value in env .items ():
394417 clean_x_glean_env .setenv (name , value )
395418
396- captured = []
419+ request = send_query ()
397420
398- def handler (request : httpx .Request ) -> httpx .Response :
399- captured .append (request )
400- return httpx .Response (200 , json = {})
421+ assert request .headers .get (INCLUDE_EXPERIMENTAL_HEADER ) == expected
422+ assert "X-Glean-Beta" not in request .headers
401423
402- glean = Glean (
403- api_token = "test-token" ,
404- server_url = "https://example.com" ,
405- client = httpx .Client (transport = httpx .MockTransport (handler )),
406- )
407- try :
408- glean .search .query (query = "test" )
409- except Exception : # pylint: disable=broad-exception-caught
410- pass # The empty response body may not validate; only the request matters.
411424
412- assert captured , "expected a request to be sent"
413- assert captured [0 ].headers .get (INCLUDE_EXPERIMENTAL_HEADER ) == expected
414- assert "X-Glean-Beta" not in captured [0 ].headers
425+ @pytest .mark .parametrize (
426+ "kwargs, expected_experimental, expected_deprecated" ,
427+ [
428+ pytest .param ({}, None , None , id = "no options" ),
429+ pytest .param ({"include_beta" : True }, "true" , None , id = "include_beta=True" ),
430+ pytest .param ({"include_beta" : False }, None , None , id = "include_beta=False" ),
431+ pytest .param (
432+ {"include_experimental" : True }, "true" , None , id = "include_experimental=True"
433+ ),
434+ pytest .param (
435+ {"include_beta" : False , "include_experimental" : True },
436+ "true" ,
437+ None ,
438+ id = "include_beta=False does not turn off include_experimental" ,
439+ ),
440+ pytest .param (
441+ {"exclude_deprecated_after" : "2026-10-15" },
442+ None ,
443+ "2026-10-15" ,
444+ id = "exclude_deprecated_after" ,
445+ ),
446+ pytest .param (
447+ {"exclude_deprecated_after" : "2026-10-15" , "include_beta" : True },
448+ "true" ,
449+ "2026-10-15" ,
450+ id = "all options" ,
451+ ),
452+ ],
453+ )
454+ def test_sdk_constructor_options (
455+ clean_x_glean_env , kwargs , expected_experimental , expected_deprecated
456+ ):
457+ """The Glean constructor accepts the X-Glean options and sends their headers.
458+
459+ These options live in generated files (sdk.py and sdkconfiguration.py) and a
460+ regeneration has dropped them before, so this guards against that.
461+ """
462+ request = send_query (** kwargs )
463+
464+ assert request .headers .get (INCLUDE_EXPERIMENTAL_HEADER ) == expected_experimental
465+ assert request .headers .get (EXCLUDE_DEPRECATED_AFTER_HEADER ) == expected_deprecated
466+ assert "X-Glean-Beta" not in request .headers
467+
468+
469+ def test_env_var_overrides_constructor_option (clean_x_glean_env ):
470+ """X_GLEAN_INCLUDE_BETA takes precedence over the include_beta constructor option."""
471+ clean_x_glean_env .setenv (INCLUDE_BETA_ENV_VAR , "false" )
472+
473+ request = send_query (include_beta = True )
474+
475+ assert INCLUDE_EXPERIMENTAL_HEADER not in request .headers
415476
416477
417478if __name__ == "__main__" :
0 commit comments