Unverified Commit 3c24ed2f authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

nixosTests.printing-{socket,service,socket-notcp,service-notcp}: migrate to runTest (#399201)

parents 9d700be4 46ddd0d9

nixos/tests/all-tests.nix

+16 −12
Original line number Diff line number Diff line
@@ -1092,21 +1092,25 @@ in 
  pretalx = runTest ./web-apps/pretalx.nix;

  prefect = runTest ./prefect.nix;

  pretix = runTest ./web-apps/pretix.nix;

  printing-socket = handleTest ./printing.nix {

    socket = true;

    listenTcp = true;

  printing-socket = runTest {

    imports = [ ./printing.nix ];

    _module.args.socket = true;

    _module.args.listenTcp = true;

  };

  printing-service = handleTest ./printing.nix {

    socket = false;

    listenTcp = true;

  printing-service = runTest {

    imports = [ ./printing.nix ];

    _module.args.socket = false;

    _module.args.listenTcp = true;

  };

  printing-socket-notcp = handleTest ./printing.nix {

    socket = true;

    listenTcp = false;

  printing-socket-notcp = runTest {

    imports = [ ./printing.nix ];

    _module.args.socket = true;

    _module.args.listenTcp = false;

  };

  printing-service-notcp = handleTest ./printing.nix {

    socket = false;

    listenTcp = false;

  printing-service-notcp = runTest {

    imports = [ ./printing.nix ];

    _module.args.socket = false;

    _module.args.listenTcp = false;

  };

  private-gpt = handleTest ./private-gpt.nix { };

  privatebin = runTest ./privatebin.nix;

nixos/tests/printing.nix

+133 −136
Original line number Diff line number Diff line 
# Test printing via CUPS.



import ./make-test-python.nix (

{

  pkgs,

  socket ? true, # whether to use socket activation
@@ -138,4 +136,3 @@ import ./make-test-python.nix ( 
            server.execute("rm /var/spool/cups/*")

  '';

}
 
)