Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc47794ab580
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd265313e7b1
Choose a head ref
  • 5 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 21, 2017

  1. nixos tests: retry: Count down to 0, and pass remaining attempts to t… 

    …he sub

Allows test functions to output diagnostic information on failure.
    @grahamc
    grahamc committed Jun 21, 2017
    Copy the full SHA
    56435c1 View commit details

  2. nixos tests: waitUntilTTYMatches: Log TTY contents on last try 

    If the test has not passed yet, on the last attempt it now outputs:

    machine: Last chance to match /logine: / on TTY2, which currently contains:
    machine: running command: fold -w$(stty -F /dev/tty2 size | awk '{print $2}') /dev/vcs2
    machine: exit status 0
    machine:

    <<< Welcome to NixOS 17.09.git.a804ef4 (x86_64) - tty2 >>>

    machine login:

to help debug the problem. Notice the "logine" typo in my check.
    @grahamc
    grahamc committed Jun 21, 2017
    Copy the full SHA
    348785e View commit details

  3. nixos tests: waitForText: output the detected screen content prior to… 

    … the last attempt

    machine: Last chance to match /(?^:BALICE)/ on the screen, which currently contains:
    machine: performing optical character recognition
    machine: sending monitor command: screendump /tmp/nix-build-vm-test-run-sddm.drv-0/ocrin.ppm
    machine: Session Layout

    O O

    0 1 : 0 9

    Wednesday, June 21, 2017

    |_ I

    Select your user and enter password
    @grahamc
    grahamc committed Jun 21, 2017
    Copy the full SHA
    1b83301 View commit details

  4. nixos tests: waitForWindow: output a list of windows we see prior to … 

    …the final check

    machine: must succeed: xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'
    machine: exit status 0
    machine: Last chance to match /(?^:dfiirst configuration)/ on the the window list, which currently contains:
    machine: [i3 con] container around 0xf8a5f0, i3: first configuration, [i3 con] floatingcon around 0xf8c260, [i3 con] container around 0xf8a380, i3bar for output Virtual-1, [i3 con] bottom dockarea Virtual-1, [i3 con] workspace 1, [i3 con] content Virtual-1, [i3 con] top dockarea Virtual-1, [i3 con] output Virtual-1, [i3 con] workspace __i3_scratch, [i3 con] content __i3, [i3 con] pseudo-output __i3, i3
    @grahamc
    grahamc committed Jun 21, 2017
    Copy the full SHA
    3f40fca View commit details

  5. Merge pull request #26736 from grahamc/improve-nixos-test-debug 

    Improve nixos test debug
    @grahamc
    grahamc authored Jun 21, 2017
    Copy the full SHA
    dd26531 View commit details
Loading