diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
commit | f504af072bc5cf49da008e6970c214255d5f46ed (patch) | |
tree | f2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /nixos/tests | |
parent | 11ceef47699fb0911bea790e4b8059d97e95ad14 (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2 nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip |
Merge branch 'master' into staging-next
There's been some large rebuild on master. I don't really have time ATM to find what it was.
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/acme.nix | 4 | ||||
-rw-r--r-- | nixos/tests/netdata.nix | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 6d728b387e14..c7fd4910e072 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -12,7 +12,9 @@ let ''; }); - pythonPackages = (super.python.override { + # Override certifi so that it accepts fake certificate for Let's Encrypt + # Need to override the attribute used by simp_le, which is python3Packages + python3Packages = (super.python3.override { packageOverrides = lib.const (pysuper: { certifi = pysuper.certifi.overridePythonAttrs (attrs: { postPatch = (attrs.postPatch or "") + '' diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index c56506ba2874..eb45db6f04c3 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -19,8 +19,12 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $netdata->waitForUnit("netdata.service"); - # check if netdata can read disk ops for root owned processes. - # if > 0, successful. verifies both netdata working and + + # check if the netdata main page loads. + $netdata->succeed("curl --fail http://localhost:19999/"); + + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. my $cmd = <<'CMD'; curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ |