mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
nixos/tests: fix typos
This commit is contained in:
parent
c8fc2ec398
commit
202699c918
@ -133,7 +133,7 @@ def retry(fn: Callable, timeout: int = 900) -> None:
|
||||
|
||||
|
||||
class StartCommand:
|
||||
"""The Base Start Command knows how to append the necesary
|
||||
"""The Base Start Command knows how to append the necessary
|
||||
runtime qemu options as determined by a particular test driver
|
||||
run. Any such start command is expected to happily receive and
|
||||
append additional qemu args.
|
||||
@ -211,7 +211,7 @@ class StartCommand:
|
||||
class NixStartScript(StartCommand):
|
||||
"""A start script from nixos/modules/virtualiation/qemu-vm.nix
|
||||
that also satisfies the requirement of the BaseStartCommand.
|
||||
These Nix commands have the particular charactersitic that the
|
||||
These Nix commands have the particular characteristic that the
|
||||
machine name can be extracted out of them via a regex match.
|
||||
(Admittedly a _very_ implicit contract, evtl. TODO fix)
|
||||
"""
|
||||
@ -527,7 +527,7 @@ class Machine:
|
||||
timeout_str = f"timeout {timeout}"
|
||||
|
||||
# While sh is bash on NixOS, this is not the case for every distro.
|
||||
# We explicitely call bash here to allow for the driver to boot other distros as well.
|
||||
# We explicitly call bash here to allow for the driver to boot other distros as well.
|
||||
out_command = (
|
||||
f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
|
||||
)
|
||||
|
@ -407,7 +407,7 @@ in {
|
||||
# Ensures the issuer of our cert matches the chain
|
||||
# and matches the issuer we expect it to be.
|
||||
# It's a good validation to ensure the cert.pem and fullchain.pem
|
||||
# are not still selfsigned afer verification
|
||||
# are not still selfsigned after verification
|
||||
def check_issuer(node, cert_name, issuer):
|
||||
for fname in ("cert.pem", "fullchain.pem"):
|
||||
actual_issuer = node.succeed(
|
||||
|
@ -199,7 +199,7 @@ in
|
||||
];
|
||||
};
|
||||
everything = makeTest {
|
||||
name = "atop-everthing";
|
||||
name = "atop-everything";
|
||||
nodes.machine = {
|
||||
programs.atop = {
|
||||
enable = true;
|
||||
|
@ -132,7 +132,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
'';
|
||||
})
|
||||
|
||||
# This canary process mimicks a storage daemon, which we do NOT want to be
|
||||
# This canary process mimics a storage daemon, which we do NOT want to be
|
||||
# killed before going into stage 2. For more on root storage daemons, see:
|
||||
# https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
|
||||
(mkCmdlineCanary {
|
||||
|
@ -93,7 +93,7 @@ import ./make-test-python.nix (
|
||||
password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input')
|
||||
set_value(password_input, "${password}")
|
||||
|
||||
log("Submiting credentials for login")
|
||||
log("Submitting credentials for login")
|
||||
driver.find_element(By.CSS_SELECTOR, 'button#login-button').click()
|
||||
|
||||
# driver.implicitly_wait(1)
|
||||
@ -102,7 +102,7 @@ import ./make-test-python.nix (
|
||||
log("Waiting dashboard to load")
|
||||
wait_title_contains("${user}@server")
|
||||
|
||||
log("Waiting for the frontend to initalize")
|
||||
log("Waiting for the frontend to initialize")
|
||||
sleep(1)
|
||||
|
||||
log("Looking for that banner that tells about limited access")
|
||||
|
@ -143,7 +143,7 @@ in {
|
||||
"curl -sSfL 'http://site2.local/doku.php?id=plugin-list' | (! grep 'plugin:tag')",
|
||||
)
|
||||
|
||||
# Test if theme is applied and working correctly (no weired relative PHP import errors)
|
||||
# Test if theme is applied and working correctly (no weird relative PHP import errors)
|
||||
machine.succeed(
|
||||
"curl -sSfL 'http://site1.local/doku.php' | grep 'bootstrap3/images/logo.png'",
|
||||
"curl -sSfL 'http://site1.local/lib/exe/css.php' | grep 'bootstrap3'",
|
||||
|
@ -1,4 +1,4 @@
|
||||
# To run the test on the unfree ELK use the folllowing command:
|
||||
# To run the test on the unfree ELK use the following command:
|
||||
# cd path/to/nixpkgs
|
||||
# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6
|
||||
|
||||
|
@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
||||
machine.screenshot("wizard7")
|
||||
machine.succeed("xdotool mousemove 512 740 click 1") # Next
|
||||
|
||||
machine.wait_for_text("BlusZ") # Bluetooh Management (default)
|
||||
machine.wait_for_text("BlusZ") # Bluetooth Management (default)
|
||||
machine.screenshot("wizard8")
|
||||
machine.succeed("xdotool mousemove 512 740 click 1") # Next
|
||||
|
||||
|
@ -39,7 +39,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
# Keep line widths somewhat managable
|
||||
# Keep line widths somewhat manageable
|
||||
user = nodes.machine.config.users.users.alice;
|
||||
uid = toString user.uid;
|
||||
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
|
||||
|
@ -42,7 +42,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
||||
|
||||
assert title == "Gotify"
|
||||
|
||||
# Ensure that the UI responds with a successfuly code and that the
|
||||
# Ensure that the UI responds with a successful code and that the
|
||||
# response is not empty
|
||||
result = machine.succeed("curl -fsS localhost:3000")
|
||||
assert result, "HTTP response from localhost:3000 must not be empty!"
|
||||
|
@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
testScript = ''
|
||||
machine.wait_for_unit("headscale")
|
||||
machine.wait_for_open_port(8080)
|
||||
# Test basic funcionality
|
||||
# Test basic functionality
|
||||
machine.succeed("headscale namespaces create test")
|
||||
machine.succeed("headscale preauthkeys -u test create")
|
||||
'';
|
||||
|
@ -57,7 +57,7 @@ in {
|
||||
# Send the key to our local keyserver
|
||||
machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId)
|
||||
|
||||
# Recieve the key from our local keyserver to a separate directory
|
||||
# Receive the key from our local keyserver to a separate directory
|
||||
machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId)
|
||||
'';
|
||||
})
|
||||
|
@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
|
||||
priority = 2000;
|
||||
shred = true;
|
||||
};
|
||||
# using mail somewhere should add --mail to logrotate invokation
|
||||
# using mail somewhere should add --mail to logrotate invocation
|
||||
sendmail = {
|
||||
mail = "user@domain.tld";
|
||||
};
|
||||
|
@ -73,7 +73,7 @@ in {
|
||||
nextcloudwithopenssl1.succeed("nextcloud-occ status")
|
||||
|
||||
with subtest("Existing encrypted files cannot be read, but new files can be added"):
|
||||
# This will succed starting NC26 because of their custom implementation of openssl_seal
|
||||
# This will succeed starting NC26 because of their custom implementation of openssl_seal
|
||||
read_existing_file_test = nextcloudwithopenssl1.fail if nextcloud_version < 26 else nextcloudwithopenssl1.succeed
|
||||
read_existing_file_test("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file >&2")
|
||||
nextcloudwithopenssl1.succeed("nextcloud-occ encryption:disable")
|
||||
|
@ -62,7 +62,7 @@ in {
|
||||
"sudo -g orangefs -u orangefs pvfs2-server -f /etc/orangefs/server.conf"
|
||||
)
|
||||
|
||||
# start services after storage is formated on all machines
|
||||
# start services after storage is formatted on all machines
|
||||
for server in server1, server2:
|
||||
server.succeed("systemctl start orangefs-server.service")
|
||||
|
||||
|
@ -43,7 +43,7 @@ in {
|
||||
machine.execute("su - alice -c signal-desktop >&2 &")
|
||||
|
||||
# Wait for the Signal window to appear. Since usually the tests
|
||||
# are run sandboxed and therfore with no internet, we can not wait
|
||||
# are run sandboxed and therefore with no internet, we can not wait
|
||||
# for the message "Link your phone ...". Nor should we wait for
|
||||
# the "Failed to connect to server" message, because when manually
|
||||
# running this test it will be not sandboxed.
|
||||
|
@ -1,6 +1,6 @@
|
||||
# This test verifies that we can request and assign IPv6 prefixes from upstream
|
||||
# (e.g. ISP) routers.
|
||||
# The setup consits of three VMs. One for the ISP, as your residential router
|
||||
# The setup consists of three VMs. One for the ISP, as your residential router
|
||||
# and the third as a client machine in the residential network.
|
||||
#
|
||||
# There are two VLANs in this test:
|
||||
@ -268,7 +268,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
# This is the client behind the router. We should be receving router
|
||||
# This is the client behind the router. We should be receiving router
|
||||
# advertisements for both the ULA and the delegated prefix.
|
||||
# All we have to do is boot with the default (networkd) configuration.
|
||||
client = {
|
||||
|
@ -9,7 +9,7 @@ with pkgs.lib;
|
||||
let
|
||||
# A testScript fragment that prepares a disk with some empty, unpartitioned
|
||||
# space. and uses it to boot the test with. Takes a single argument `machine`
|
||||
# from which the diskImage is extraced.
|
||||
# from which the diskImage is extracted.
|
||||
useDiskImage = machine: ''
|
||||
import os
|
||||
import shutil
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Test that our unbound module indeed works as most users would expect.
|
||||
There are a few settings that we must consider when modifying the test. The
|
||||
ususal use-cases for unbound are
|
||||
usual use-cases for unbound are
|
||||
* running a recursive DNS resolver on the local machine
|
||||
* running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53
|
||||
* running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT)
|
||||
@ -74,7 +74,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
};
|
||||
};
|
||||
|
||||
# The resolver that knows that fowards (only) to the authoritative server
|
||||
# The resolver that knows that forwards (only) to the authoritative server
|
||||
# and listens on UDP/53, TCP/53 & TCP/853.
|
||||
resolver = { lib, nodes, ... }: {
|
||||
imports = [ common ];
|
||||
|
Loading…
Reference in New Issue
Block a user