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: 3df16a48bf41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a7a8442c172
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 20, 2021

  1. nixos/tests/chromium: Fix a race condition 

    Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR #110010).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).
    @primeos
    primeos committed Jan 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    gaborbernat Bernát Gábor
    GPG key ID: EEDA44E02406AF79
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8a7a844 View commit details
Showing with 8 additions and 7 deletions.
  1. +8 −7 nixos/tests/chromium.nix
15 changes: 8 additions & 7 deletions nixos/tests/chromium.nix
View file
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
def close_win():
def try_close(_):
machine.execute(
status, _ = machine.execute(
ru(
"${xdo "close-window" ''
search --onlyvisible --name "new tab"
@@ -89,13 +89,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
''}"
)
)
machine.execute(
ru(
"${xdo "close-window" ''
key Ctrl+w
''}"
if status == 0:
machine.execute(
ru(
"${xdo "close-window" ''
key Ctrl+w
''}"
)
)
)
for _ in range(1, 20):
status, out = machine.execute(
ru(