commit b7749c76715ba96727f7a12bc2514ddfa6847813 · pyrox.dev/nixpkgs

+23 -2

nixos/doc/manual/development/writing-nixos-tests.xml

···

       274
       274
        
           </term>

     

       275
       275
        
           <listitem>

     

       276
       276
        
            <para>

     

       277
       277
       -
             Execute a shell command, raising an exception if the exit status is not

     

       278
       278
       -
             zero, otherwise returning the standard output.

     

       277
       277
       +
             Execute a shell command, raising an exception if the exit status

     

       278
       278
       +
             is not zero, otherwise returning the standard output. Commands

     

       279
       279
       +
             are run with <literal>set -euo pipefail</literal> set:

     

       280
       280
       +
             <itemizedlist>

     

       281
       281
       +
               <listitem>

     

       282
       282
       +
                 <para>

     

       283
       283
       +
                   If several commands are separated by <literal>;</literal>

     

       284
       284
       +
                   and one fails, the command as a whole will fail.

     

       285
       285
       +
                 </para>

     

       286
       286
       +
               </listitem>

     

       287
       287
       +
               <listitem>

     

       288
       288
       +
                 <para>

     

       289
       289
       +
                   For pipelines, the last non-zero exit status will be

     

       290
       290
       +
                   returned (if there is one, zero will be returned

     

       291
       291
       +
                   otherwise).

     

       292
       292
       +
                 </para>

     

       293
       293
       +
               </listitem>

     

       294
       294
       +
               <listitem>

     

       295
       295
       +
                 <para>

     

       296
       296
       +
                   Dereferencing unset variables fail the command.

     

       297
       297
       +
                 </para>

     

       298
       298
       +
               </listitem>

     

       299
       299
       +
             </itemizedlist>

     

       279
       300
        
            </para>

     

       280
       301
        
           </listitem>

     

       281
       302
        
          </varlistentry>

+1 -1

nixos/lib/test-driver/test-driver.py

···

       441
       441
        
           def execute(self, command: str) -> Tuple[int, str]:

     

       442
       442
        
               self.connect()

     

       443
       443
        
       

     

       444
       444
       -
               out_command = "( {} ); echo '|!=EOF' $?\n".format(command)

     

       444
       444
       +
               out_command = "( set -euo pipefail; {} ); echo '|!=EOF' $?\n".format(command)

     

       445
       445
        
               self.shell.send(out_command.encode())

     

       446
       446
        
       

     

       447
       447
        
               output = ""

+3 -3

nixos/tests/docker-tools.nix

···

       23
       23
        
           with subtest("includeStorePath"):

     

       24
       24
        
               with subtest("assumption"):

     

       25
       25
        
                   docker.succeed("${examples.helloOnRoot} | docker load")

     

       26
       26
       -
                   docker.succeed("set -euo pipefail; docker run --rm hello | grep -i hello")

     

       26
       26
       +
                   docker.succeed("docker run --rm hello | grep -i hello")

     

       27
       27
        
                   docker.succeed("docker image rm hello:latest")

     

       28
       28
        
               with subtest("includeStorePath = false; breaks example"):

     

       29
       29
        
                   docker.succeed("${examples.helloOnRootNoStore} | docker load")

     

       30
       30
       -
                   docker.fail("set -euo pipefail; docker run --rm hello | grep -i hello")

     

       30
       30
       +
                   docker.fail("docker run --rm hello | grep -i hello")

     

       31
       31
        
                   docker.succeed("docker image rm hello:latest")

     

       32
       32
        
               with subtest("includeStorePath = false; works with mounted store"):

     

       33
       33
        
                   docker.succeed("${examples.helloOnRootNoStore} | docker load")

     

       34
       34
       -
                   docker.succeed("set -euo pipefail; docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello")

     

       34
       34
       +
                   docker.succeed("docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello")

     

       35
       35
        
                   docker.succeed("docker image rm hello:latest")

     

       36
       36
        
       

     

       37
       37
        
           with subtest("Ensure Docker images use a stable date by default"):

+3 -3

nixos/tests/wiki-js.nix

···

       119
       119
        
       

     

       120
       120
        
           with subtest("Setup"):

     

       121
       121
        
               result = machine.succeed(

     

       122
       122
       -
                   "set -o pipefail; curl -sSf localhost:3000/finalize -X POST -d "

     

       122
       122
       +
                   "curl -sSf localhost:3000/finalize -X POST -d "

     

       123
       123
        
                   + "@${payloads.finalize} -H 'Content-Type: application/json' "

     

       124
       124
        
                   + "| jq .ok | xargs echo"

     

       125
       125
        
               )

     
···

       132
       132
        
       

     

       133
       133
        
           with subtest("Base functionality"):

     

       134
       134
        
               auth = machine.succeed(

     

       135
       135
       -
                   "set -o pipefail; curl -sSf localhost:3000/graphql -X POST "

     

       135
       135
       +
                   "curl -sSf localhost:3000/graphql -X POST "

     

       136
       136
        
                   + "-d @${payloads.login} -H 'Content-Type: application/json' "

     

       137
       137
        
                   + "| jq '.[0].data.authentication.login.jwt' | xargs echo"

     

       138
       138
        
               ).strip()

     
···

       140
       140
        
               assert auth

     

       141
       141
        
       

     

       142
       142
        
               create = machine.succeed(

     

       143
       143
       -
                   "set -o pipefail; curl -sSf localhost:3000/graphql -X POST "

     

       143
       143
       +
                   "curl -sSf localhost:3000/graphql -X POST "

     

       144
       144
        
                   + "-d @${payloads.content} -H 'Content-Type: application/json' "

     

       145
       145
        
                   + f"-H 'Authorization: Bearer {auth}' "

     

       146
       146
        
                   + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"