nixosTests.mediawiki: handleTest -> runTest (#479835) (0b0454e2) · Commits · nix / nixpkgs

nixos/tests/all-tests.nix

+4 −1

Original line number	Diff line number	Diff line
		@@ -950,7 +950,10 @@ in
		mealie = runTest ./mealie.nix;
		mediamtx = runTest ./mediamtx.nix;
		mediatomb = runTest ./mediatomb.nix;
		mediawiki = handleTest ./mediawiki.nix { };
		mediawiki = import ./mediawiki.nix {
		inherit (pkgs) lib;
		inherit runTest;
		};
		meilisearch = runTest ./meilisearch.nix;
		memcached = runTest ./memcached.nix;
		merecat = runTest ./merecat.nix;

nixos/tests/mediawiki.nix

+27 −25

Original line number	Diff line number	Diff line
		{
		system ? builtins.currentSystem,
		config ? { },
		pkgs ? import ../.. { inherit system config; },
		}:
		{ lib, runTest }:

		let
		shared = {
		shared =
		{ pkgs, ... }:
		{
		services.mediawiki.enable = true;
		services.mediawiki.httpd.virtualHost.hostName = "localhost";
		services.mediawiki.httpd.virtualHost.adminAddr = "root@example.com";
		@@ -19,13 +17,17 @@ let
		};
		};

		testLib = import ../lib/testing-python.nix {
		inherit system pkgs;
		extraConfigurations = [ shared ];
		makeTest =
		t:
		runTest {
		imports = [
		{ nodes.machine.imports = [ shared ]; }
		t
		];
		};
		in
		{
		mysql = testLib.makeTest {
		mysql = makeTest {
		name = "mediawiki-mysql";
		nodes.machine = {
		services.mediawiki.database.type = "mysql";
		@@ -40,7 +42,7 @@ in
		'';
		};

		postgresql = testLib.makeTest {
		postgresql = makeTest {
		name = "mediawiki-postgres";
		nodes.machine = {
		services.mediawiki.database.type = "postgres";
		@@ -55,7 +57,7 @@ in
		'';
		};

		nohttpd = testLib.makeTest {
		nohttpd = makeTest {
		name = "mediawiki-nohttpd";
		nodes.machine = {
		services.mediawiki.webserver = "none";
		@@ -72,12 +74,12 @@ in
		'QUERY_STRING=title=Main_Page',
		"REQUEST_METHOD=GET",
		);
		page = machine.succeed(f"{' '.join(env)} ${pkgs.fcgi}/bin/cgi-fcgi -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
		page = machine.succeed(f"{' '.join(env)} ${lib.getExe nodes.machine.nixpkgs.pkgs.fcgi} -bind -connect ${nodes.machine.services.phpfpm.pools.mediawiki.socket}")
		assert "MediaWiki has been installed" in page, f"no 'MediaWiki has been installed' in:\n{page}"
		'';
		};

		nginx = testLib.makeTest {
		nginx = makeTest {
		name = "mediawiki-nginx";
		nodes.machine = {
		services.mediawiki.webserver = "nginx";