commit 44d0f3783387cdd7dfe05a32ff9c623eeebd0b57 · pyrox.dev/nixpkgs

+40

doc/builders/testers.chapter.md

···

       35
       35
        
       };

     

       36
       36
        
       ```

     

       37
       37
        
       

     

       38
       38
       +
       ## `testBuildFailure` {#tester-testBuildFailure}

     

       39
       39
       +
       

     

       40
       40
       +
       Make sure that a build does not succeed. This is useful for testing testers.

     

       41
       41
       +
       

     

       42
       42
       +
       This returns a derivation with an override on the builder, with the following effects:

     

       43
       43
       +
       

     

       44
       44
       +
        - Fail the build when the original builder succeeds

     

       45
       45
       +
        - Move `$out` to `$out/result`, if it exists (assuming `out` is the default output)

     

       46
       46
       +
        - Save the build log to `$out/testBuildFailure.log` (same)

     

       47
       47
       +
       

     

       48
       48
       +
       Example:

     

       49
       49
       +
       

     

       50
       50
       +
       ```nix

     

       51
       51
       +
       runCommand "example" {

     

       52
       52
       +
         failed = testers.testBuildFailure (runCommand "fail" {} ''

     

       53
       53
       +
           echo ok-ish >$out

     

       54
       54
       +
           echo failing though

     

       55
       55
       +
           exit 3

     

       56
       56
       +
         '');

     

       57
       57
       +
       } ''

     

       58
       58
       +
         grep -F 'ok-ish' $failed/result

     

       59
       59
       +
         grep -F 'failing though' $failed/testBuildFailure.log

     

       60
       60
       +
         [[ 3 = $(cat $failed/testBuildFailure.exit) ]]

     

       61
       61
       +
         touch $out

     

       62
       62
       +
       '';

     

       63
       63
       +
       ```

     

       64
       64
       +
       

     

       65
       65
       +
       While `testBuildFailure` is designed to keep changes to the original builder's 

     

       66
       66
       +
       environment to a minimum, some small changes are inevitable.

     

       67
       67
       +
       

     

       68
       68
       +
        - The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted.

     

       69
       69
       +
        - `stdout` and `stderr` are a pipe instead of a tty. This could be improved.

     

       70
       70
       +
        - One or two extra processes are present in the sandbox during the original

     

       71
       71
       +
          builder's execution.

     

       72
       72
       +
        - The derivation and output hashes are different, but not unusual.

     

       73
       73
       +
        - The derivation includes a dependency on `buildPackages.bash` and

     

       74
       74
       +
          `expect-failure.sh`, which is built to include a transitive dependency on

     

       75
       75
       +
          `buildPackages.coreutils` and possibly more. These are not added to `PATH`

     

       76
       76
       +
          or any other environment variable, so they should be hard to observe.

     

       77
       77
       +
       

     

       38
       78
        
       ## `testEqualDerivation` {#tester-testEqualDerivation}

     

       39
       79
        
       

     

       40
       80
        
       Checks that two packages produce the exact same build instructions.

+11 -1

pkgs/build-support/testers/default.nix

···

       1
       1
       -
       { pkgs, lib, callPackage, runCommand, stdenv }:

     

       1
       1
       +
       { pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, }:

     

       2
       2
        
       # Documentation is in doc/builders/testers.chapter.md

     

       3
       3
        
       {

     

       4
       4
       +
         # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure

     

       5
       5
       +
         # or doc/builders/testers.chapter.md

     

       6
       6
       +
         testBuildFailure = drv: drv.overrideAttrs (orig: {

     

       7
       7
       +
           builder = buildPackages.bash;

     

       8
       8
       +
           args = [

     

       9
       9
       +
             (substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; })

     

       10
       10
       +
             orig.realBuilder or stdenv.shell

     

       11
       11
       +
           ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];

     

       12
       12
       +
         });

     

       13
       13
       +
       

     

       4
       14
        
         testEqualDerivation = callPackage ./test-equal-derivation.nix { };

     

       5
       15
        
       

     

       6
       16
        
         testVersion =

+62

pkgs/build-support/testers/expect-failure.sh

···

       1
       1
       +
       # Run a builder, flip exit code, save log and fix outputs

     

       2
       2
       +
       #

     

       3
       3
       +
       # Sub-goals:

     

       4
       4
       +
       # - Delegate to another original builder passed via args

     

       5
       5
       +
       # - Save the build log to output for further checks

     

       6
       6
       +
       # - Make the derivation succeed if the original builder fails

     

       7
       7
       +
       # - Make the derivation fail if the original builder returns exit code 0

     

       8
       8
       +
       #

     

       9
       9
       +
       # Requirements:

     

       10
       10
       +
       # This runs before, without and after stdenv. Do not modify the environment;

     

       11
       11
       +
       # especially not before invoking the original builder. For example, use

     

       12
       12
       +
       # "@" substitutions instead of PATH.

     

       13
       13
       +
       # Do not export any variables.

     

       14
       14
       +
       

     

       15
       15
       +
       # Stricter bash

     

       16
       16
       +
       set -eu

     

       17
       17
       +
       

     

       18
       18
       +
       # ------------------------

     

       19
       19
       +
       # Run the original builder

     

       20
       20
       +
       

     

       21
       21
       +
       echo "testBuildFailure: Expecting non-zero exit from builder and args: ${*@Q}"

     

       22
       22
       +
       

     

       23
       23
       +
       ("$@" 2>&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \

     

       24
       24
       +
         | while read ln; do

     

       25
       25
       +
           echo "original builder: $ln"

     

       26
       26
       +
         done

     

       27
       27
       +
       

     

       28
       28
       +
       r=${PIPESTATUS[0]}

     

       29
       29
       +
       if [[ $r = 0 ]]; then

     

       30
       30
       +
         echo "testBuildFailure: The builder did not fail, but a failure was expected!"

     

       31
       31
       +
         exit 1

     

       32
       32
       +
       fi

     

       33
       33
       +
       echo "testBuildFailure: Original builder produced exit code: $r"

     

       34
       34
       +
       

     

       35
       35
       +
       # -----------------------------------------

     

       36
       36
       +
       # Write the build log to the default output

     

       37
       37
       +
       

     

       38
       38
       +
       outs=( $outputs )

     

       39
       39
       +
       defOut=${outs[0]}

     

       40
       40
       +
       defOutPath=${!defOut}

     

       41
       41
       +
       

     

       42
       42
       +
       if [[ ! -d $defOutPath ]]; then

     

       43
       43
       +
         if [[ -e $defOutPath ]]; then

     

       44
       44
       +
           @coreutils@/bin/mv $defOutPath $TMPDIR/out-node

     

       45
       45
       +
           @coreutils@/bin/mkdir $defOutPath

     

       46
       46
       +
           @coreutils@/bin/mv $TMPDIR/out-node $defOutPath/result

     

       47
       47
       +
         fi

     

       48
       48
       +
       fi

     

       49
       49
       +
       

     

       50
       50
       +
       @coreutils@/bin/mkdir -p $defOutPath

     

       51
       51
       +
       @coreutils@/bin/mv $TMPDIR/testBuildFailure.log $defOutPath/testBuildFailure.log

     

       52
       52
       +
       echo $r >$defOutPath/testBuildFailure.exit

     

       53
       53
       +
       

     

       54
       54
       +
       # ------------------------------------------------------

     

       55
       55
       +
       # Put empty directories in place for any missing outputs

     

       56
       56
       +
       

     

       57
       57
       +
       for outputName in ${outputs:-out}; do

     

       58
       58
       +
         outputPath="${!outputName}"

     

       59
       59
       +
         if [[ ! -e "${outputPath}" ]]; then

     

       60
       60
       +
           @coreutils@/bin/mkdir "${outputPath}";

     

       61
       61
       +
         fi

     

       62
       62
       +
       done

+50 -1

pkgs/build-support/testers/test/default.nix

···

       1
       1
       -
       { testers, lib, pkgs, ... }:

     

       1
       1
       +
       { testers, lib, pkgs, hello, runCommand, ... }:

     

       2
       2
        
       let

     

       3
       3
        
         pkgs-with-overlay = pkgs.extend(final: prev: {

     

       4
       4
        
           proof-of-overlay-hello = prev.hello;

     
···

       24
       24
        
             machine.succeed("hello | figlet >/dev/console")

     

       25
       25
        
           '';

     

       26
       26
        
         });

     

       27
       27
       +
       

     

       28
       28
       +
         testBuildFailure = lib.recurseIntoAttrs {

     

       29
       29
       +
           happy = runCommand "testBuildFailure-happy" {

     

       30
       30
       +
             failed = testers.testBuildFailure (runCommand "fail" {} ''

     

       31
       31
       +
               echo ok-ish >$out

     

       32
       32
       +
               echo failing though

     

       33
       33
       +
               echo also stderr 1>&2

     

       34
       34
       +
               exit 3

     

       35
       35
       +
             '');

     

       36
       36
       +
           } ''

     

       37
       37
       +
             grep -F 'failing though' $failed/testBuildFailure.log

     

       38
       38
       +
             grep -F 'also stderr' $failed/testBuildFailure.log

     

       39
       39
       +
             grep -F 'ok-ish' $failed/result

     

       40
       40
       +
             [[ 3 = $(cat $failed/testBuildFailure.exit) ]]

     

       41
       41
       +
             touch $out

     

       42
       42
       +
           '';

     

       43
       43
       +
       

     

       44
       44
       +
           helloDoesNotFail = runCommand "testBuildFailure-helloDoesNotFail" {

     

       45
       45
       +
             failed = testers.testBuildFailure (testers.testBuildFailure hello);

     

       46
       46
       +
       

     

       47
       47
       +
             # Add hello itself as a prerequisite, so we don't try to run this test if

     

       48
       48
       +
             # there's an actual failure in hello.

     

       49
       49
       +
             inherit hello;

     

       50
       50
       +
           } ''

     

       51
       51
       +
             echo "Checking $failed/testBuildFailure.log"

     

       52
       52
       +
             grep -F 'testBuildFailure: The builder did not fail, but a failure was expected' $failed/testBuildFailure.log

     

       53
       53
       +
             [[ 1 = $(cat $failed/testBuildFailure.exit) ]]

     

       54
       54
       +
             touch $out

     

       55
       55
       +
           '';

     

       56
       56
       +
       

     

       57
       57
       +
           multiOutput = runCommand "testBuildFailure-multiOutput" {

     

       58
       58
       +
             failed = testers.testBuildFailure (runCommand "fail" {

     

       59
       59
       +
               # dev will be the default output

     

       60
       60
       +
               outputs = ["dev" "doc" "out"];

     

       61
       61
       +
             } ''

     

       62
       62
       +
               echo i am failing

     

       63
       63
       +
               exit 1

     

       64
       64
       +
             '');

     

       65
       65
       +
           } ''

     

       66
       66
       +
             grep -F 'i am failing' $failed/testBuildFailure.log >/dev/null

     

       67
       67
       +
             [[ 1 = $(cat $failed/testBuildFailure.exit) ]]

     

       68
       68
       +
       

     

       69
       69
       +
             # Checking our note that dev is the default output

     

       70
       70
       +
             echo $failed/_ | grep -- '-dev/_' >/dev/null

     

       71
       71
       +
       

     

       72
       72
       +
             touch $out

     

       73
       73
       +
           '';

     

       74
       74
       +
         };

     

       75
       75
       +
       

     

       27
       76
        
       }