Merge master into staging-next (6ff18cf3) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -14496,6 +14496,12 @@
		githubId = 399535;
		name = "Niklas Hambüchen";
		};
		nhnn = {
		matrix = "@nhnn:nhnn.dev";
		github = "thenhnn";
		githubId = 162156666;
		name = "nhnn";
		};
		nhooyr = {
		email = "anmol@aubble.com";
		github = "nhooyr";

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m

		- [keto](https://www.ory.sh/keto/), a permission & access control server, the first open source implementation of ["Zanzibar: Google's Consistent, Global Authorization System"](https://research.google/pubs/zanzibar-googles-consistent-global-authorization-system/).

		- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as [services.simplesamlphp](#opt-services.simplesamlphp).

		## Backward Incompatibilities {#sec-release-24.05-incompatibilities}

		<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/lib/test-driver/default.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ python3Packages.buildPythonApplication {
		coreutils
		netpbm
		python3Packages.colorama
		python3Packages.junit-xml
		python3Packages.ptpython
		qemu_pkg
		socat

nixos/lib/test-driver/pyproject.toml

+4 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ ignore_missing_imports = true
		module = "ptpython.*"
		ignore_missing_imports = true

		[[tool.mypy.overrides]]
		module = "junit_xml.*"
		ignore_missing_imports = true

		[tool.black]
		line-length = 88
		target-version = ['py39']

nixos/lib/test-driver/test_driver/init.py

+25 −5

Original line number	Diff line number	Diff line
		@@ -6,7 +6,12 @@ from pathlib import Path
		import ptpython.repl

		from test_driver.driver import Driver
		from test_driver.logger import rootlog
		from test_driver.logger import (
		CompositeLogger,
		JunitXMLLogger,
		TerminalLogger,
		XMLLogger,
		)


		class EnvDefault(argparse.Action):
		@@ -92,6 +97,11 @@ def main() -> None:
		default=Path.cwd(),
		type=writeable_dir,
		)
		arg_parser.add_argument(
		"--junit-xml",
		help="Enable JunitXML report generation to the given path",
		type=Path,
		)
		arg_parser.add_argument(
		"testscript",
		action=EnvDefault,
		@@ -102,14 +112,24 @@ def main() -> None:

		args = arg_parser.parse_args()

		output_directory = args.output_directory.resolve()
		logger = CompositeLogger([TerminalLogger()])

		if "LOGFILE" in os.environ.keys():
		logger.add_logger(XMLLogger(os.environ["LOGFILE"]))

		if args.junit_xml:
		logger.add_logger(JunitXMLLogger(output_directory / args.junit_xml))

		if not args.keep_vm_state:
		rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state")
		logger.info("Machine state will be reset. To keep it, pass --keep-vm-state")

		with Driver(
		args.start_scripts,
		args.vlans,
		args.testscript.read_text(),
		args.output_directory.resolve(),
		output_directory,
		logger,
		args.keep_vm_state,
		args.global_timeout,
		) as driver:
		@@ -125,7 +145,7 @@ def main() -> None:
		tic = time.time()
		driver.run_tests()
		toc = time.time()
		rootlog.info(f"test script finished in {(toc-tic):.2f}s")
		logger.info(f"test script finished in {(toc-tic):.2f}s")


		def generate_driver_symbols() -> None:
		@@ -134,7 +154,7 @@ def generate_driver_symbols() -> None:
		in user's test scripts. That list is then used by pyflakes to lint those
		scripts.
		"""
		d = Driver([], [], "", Path())
		d = Driver([], [], "", Path(), CompositeLogger([]))
		test_symbols = d.test_symbols()
		with open("driver-symbols", "w") as fp:
		fp.write(",".join(test_symbols.keys()))