3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3622 commits

Author SHA1 Message Date
aszlig 3895ec33ad
nixos/tests/zsh-history: Fix matching prompt
In commit fbbaa4d40f, the Zsh default
prompt has changed from "walters" to "suse". So instead of:

  root@default>

... we now have:

  root@default:~/ >

However, in the NixOS VM test, we are matching "root@default>", which
doesn't include the current working directory and thus eventually leads
to a test failure after timing out.

To fix this, I changed the regex to include a newline at the beginning
and made sure that the hostname ends with a word boundary. This way it
doesn't matter whether the prompt is "walters" or "suse", because after
all the test is not about the prompt but about whether the history
mechanism works (or not).

Signed-off-by: aszlig <aszlig@nix.build>
2021-07-02 21:01:49 +02:00
Jonathan Ringer cd687af9f4 nixos/test/vault: fix assertion logic
"vault status" now returns exit code 2 when the
vault is still unsealed.
2021-06-30 22:50:01 -07:00
Sandro 30e2735f5d
Merge pull request #83904 from ju1m/sanoid
sanoid: fix sanoid.conf generation
2021-06-30 23:55:26 +02:00
Sandro 3a0d1ab3e2
Merge pull request #128546 from scvalex/fix-kubernetes-tests
kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-06-30 01:49:58 +02:00
Luke Granger-Brown 0dccbe2729 nixos/tests/kernel-generic: fix evaluation
This is breaking the tarball build, because #128502 depends on this test
existing. After this commit, nixpkgs.tarball once again evaluates.
2021-06-28 22:41:56 +00:00
Alexandru Scvortov ab1567e812 kubernetes: fix conntrack-tools package name, missing dir, and tests 2021-06-28 20:33:17 +01:00
Robert Schütz a3d043387f nixos/tests/home-assistant: don't test package
The modules overrides extraComponents which leads to a costly rebuild of
the home-assistant package with all tests.  Make it less costly by not
running the tests, as does the default for the package option.  The
package's tests are already run by ofborg on every pull request as well
as by Hydra when building home-assistant.
2021-06-28 14:34:18 +02:00
Elis Hirwing 94d07b7492
php: Run nixpkgs-fmt on all php related files 2021-06-26 20:07:56 +02:00
github-actions[bot] 45003ba5f9
Merge master into staging-next 2021-06-26 12:06:25 +00:00
Martin Weinelt ef2ce48d8b
Merge pull request #127767 from Mic92/go-neb 2021-06-26 12:23:16 +02:00
Jörg Thalheim 34d1c55580
nixos/go-neb: secret support 2021-06-26 11:59:50 +02:00
github-actions[bot] bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Michael Weiss 370a10c27f
Merge pull request #128055 from Synthetica9/sway-check-quit
nixos/tests/sway: add check that sway quits
2021-06-25 13:23:39 +02:00
Maximilian Bosch eb5013d20d
Merge pull request #128048 from dali99/add-txredisapi-synapse
Add txredisapi to matrix-synapse dependencies
2021-06-25 10:40:11 +02:00
Robert Schütz c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
Patrick Hilhorst ad1141b528
nixos/tests/sway: add check that sway quits
We used to check that sway quits _succesfully_.
However, since 73d7f08b4d
disabled this, we'll add another check to see it quits _at all_.

cc @primeos
2021-06-25 02:06:00 +02:00
Daniel Olsen f7f52a4fbf pythonPackages.txredisapi: Add unit test 2021-06-24 23:34:03 +02:00
Michael Weiss 73d7f08b4d
sway: 1.6 -> 1.6.1
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].

[0]: https://github.com/swaywm/wlroots/pull/2810
2021-06-24 22:59:06 +02:00
Martin Weinelt eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Jörg Thalheim 7c2d15627a
Merge pull request #92378 from jnetod/zfs-smb-share-fix
zfs: patch client path used in smb share
2021-06-21 07:11:43 +02:00
github-actions[bot] 9c8cef37d2
Merge master into staging-next 2021-06-20 12:04:37 +00:00
illustris 85aa4bf92b nixos/jitsi-meet: update nixos tests
- remove check for `connected .JID: focus@auth.server` because
	- log format was changed in c1945ea6cb
	- connection.getUser() in jicofo also appears to be broken, returning null instead of username
	- testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server"

- remove check for `External component successfully authenticated` because
	- [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2)

- increase VM memory
2021-06-20 12:36:51 +02:00
github-actions[bot] d0cc21f4bd
Merge master into staging-next 2021-06-19 00:08:37 +00:00
Jörg Thalheim a4cb90bdbd
Update nixos/tests/zfs.nix
Co-authored-by: jnetod <49963580+jnetod@users.noreply.github.com>
2021-06-18 22:19:16 +02:00
Martin Weinelt af664bf942
Merge pull request #127127 from mweinelt/home-assistant
nixos/home-assistant: update hardening
2021-06-18 20:15:05 +02:00
github-actions[bot] 4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
adisbladis 1394a33858
Merge pull request #125598 from zowoq/podman
podman: 3.1.2 -> 3.2.1
2021-06-18 09:59:48 -05:00
zowoq 9edf2e0ffd nixos/podman/tests: add workaround for broken import 2021-06-18 15:43:24 +10:00
Martin Weinelt 36659d1efa
nixos/home-assistant: update hardening
This makes access to serial devices contingent on using certain
components and restricts the default setup even further.
2021-06-16 21:31:24 +02:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
markuskowa 5ad54b5bc9
Merge pull request #126785 from oxzi/ucarp-1.5.2
ucarp: init at 1.5.2 / nixos/ucarp: init / nixos/test/ucarp: init
2021-06-16 10:54:23 +02:00
aszlig c55e00d8ff
nixos/tests/overlayfs: Use individual commands
This reverts the test to be similar to its original Perl version, where
the test steps were performed as individual commands instead of what we
have now, where commands are sent to the machine as one giant string.

While this change doesn't seem like it would make a big difference, it
makes a huge difference if the test fails because you then get an error
about which command has failed exactly instead of just knowing that
"something in there" has failed.

I also switched 2 spaces indentation, because it is more in line with
Nix coding conventions.

Signed-off-by: aszlig <aszlig@nix.build>
2021-06-16 04:12:18 +02:00
aszlig 9ecde9d165
nixos/tests/overlayfs: Fix erroneous backslashes
Since commit b7749c7671, commands run as
part of VM tests are exiting immediately if an error happens.

When converting the overlayfs test to Python in commit
5ae92144ba, the individual test commands
were crammed into one big string instead of using a series of test
commands like done in the Perl version.

Additionally, the backslash-escaped dollar signs were necessary in
Perl's double-quoted strings to avoid variable interpolation, for Python
however, this results in an actual backslash being inserted into the
command.

While this obviously results in an exit code of 1 (without an error
message, since it's using bash's expression evaluation command), the
test didn't fail because putting all these commands in one string will
result in only the last error code being relevant.

With the change to "set -e" for commands sent to test machines, this has
changed and with the exit code of all commands now relevant, the test
now fails because the errors from individual command substitutions that
were prevented by escaping the dollar sign are now actually visible.

This in turn also means that until now, we wouldn't have noticed if the
overlayfs test would have failed for real.

Signed-off-by: aszlig <aszlig@nix.build>
2021-06-16 04:12:04 +02:00
Martin Weinelt ff06400b7d
Merge pull request #125011 from Xe/Xe/solanum-motd
solanum: fix MOTD
2021-06-16 00:01:24 +02:00
Alvar Penning 95ca79092e nixos/test/ucarp: init 2021-06-15 18:31:57 +02:00
Jörg Thalheim 86b1feefbd
nixos/zfs: add tests for samba 2021-06-11 08:24:56 +02:00
github-actions[bot] f023076314
Merge staging-next into staging 2021-06-10 18:14:20 +00:00
Bjørn Forsman a655b71201 nixos/jenkins: test declarative jobs 2021-06-10 19:23:28 +02:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
Vladimír Čunát 2ee781417e
nixos/*: replace alsa* aliases
The attributes got renamed in PR #126440 and in some places this caused
evaluation errors, e.g. the tarball job was saying (locally)
> attribute 'alsaUtils' missing, at /build/source/nixos/modules/services/audio/alsa.nix:6:4
and I suspect that trunk-combined jobset's failure to evaluate was also caused.
2021-06-10 09:46:55 +02:00
talyz b4fd0a9118
nixos/tests/printing: fix after setting pipefail
It failed since pipefail (b7749c7, PR #125683), due to `systemctl status`
not exiting with code=0 for inactive units (apparently).
That command is meant for humans anyway.
2021-06-10 08:01:53 +02:00
github-actions[bot] cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
Martin Weinelt e2701c3115
Merge pull request #126271 from mweinelt/firefox 2021-06-09 14:51:21 +02:00
Maximilian Bosch 10eab5b6b3
nixos/tests/kernel-generic: fix evaluation
The test doesn't evaluate since #125469 because Linux 5.11 got removed
as it's EOL.

As this fixes the evaluation of the test and it only removes a
declaration that was apparently forgotten, I figured that a push to
unbreak the test is fine.
2021-06-09 13:00:43 +02:00
Julien Moutinho b62a093a58 sanoid: fix sanoid.conf generation 2021-06-09 03:25:04 +02:00
Martin Weinelt 2d4ed9bae6
nixos/tests/custom-ca: disable firefox test integration
Firefox has been decoupled from the system certificate store since the
nss p11-kit integration in combination with our cacert package does not
expose CKA_NSS_MOZILLA_CA_POLICY, which among other things is required
for addon updates.
2021-06-09 01:52:27 +02:00
github-actions[bot] fde4df19f2
Merge staging-next into staging 2021-06-08 12:04:39 +00:00
Robert Hensing 843248d39f
Merge pull request #117379 from hercules-ci/nixos-metricbeat
nixos/metricbeat: init
2021-06-08 13:53:20 +02:00
github-actions[bot] e218376e4a
Merge staging-next into staging 2021-06-07 06:37:31 +00:00
Luke Granger-Brown 91fb672b21
Merge pull request #125573 from Flakebi/prometheus-script-exporter
prometheus-script-exporter: init at 1.2.0
2021-06-07 01:59:41 +01:00