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: e044909abaaa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a38ffcc20ede
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 1, 2020

  1. nixosTests.3proxy: fix flakiness

    @misuzu
    misuzu committed Sep 1, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    GPG key ID: 7B1CE13152E6B964
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c68886 View commit details

Commits on Sep 9, 2020

  1. Merge pull request #95752 from misuzu/3proxy-test-fix 

    nixosTests.3proxy: fix flakiness
    @ryantm
    ryantm authored Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    GPG key ID: 7B1CE13152E6B964
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a38ffcc View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/tests/3proxy.nix
4 changes: 4 additions & 0 deletions nixos/tests/3proxy.nix
View file
Original file line number Diff line number Diff line change
@@ -134,6 +134,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
};

testScript = ''
start_all()
peer0.wait_for_unit("network-online.target")
peer1.wait_for_unit("3proxy.service")
peer1.wait_for_open_port("9999")