diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-05-19 05:58:52 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-06-24 16:10:32 +0200 |
| commit | 9db625c7abf14487d7b4e6b9d9f1653e1f322cc9 (patch) | |
| tree | 357a017eb876d80998efb7e022e168ddf1e7475b /nixos | |
| parent | 4cd108043ccc75fe2ae363b1bb4068916e95df71 (diff) | |
| download | nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar.gz nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar.bz2 nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar.lz nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar.xz nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.tar.zst nixlib-9db625c7abf14487d7b4e6b9d9f1653e1f322cc9.zip | |
ostree: 2018.4 → 2018.6
Update, clean-up dependencies and add installed tests.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/ostree.nix | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 881c9bafb4cb..e494fa35029f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -314,6 +314,7 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; + tests.ostree = callTest tests/ostree.nix {}; tests.osquery = callTest tests/osquery.nix {}; tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix new file mode 100644 index 000000000000..8b19004874e7 --- /dev/null +++ b/nixos/tests/ostree.nix @@ -0,0 +1,21 @@ +# run installed tests +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "ostree"; + + meta = { + maintainers = pkgs.ostree.meta.maintainers; + }; + + # TODO: Wrap/patch the tests directly in the package + machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ])) + ]; + + environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share"); + ''; +}) |