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

Commits on Mar 28, 2019

  1. nixos/mailcatcher: fix test to be compatible with mailcatcher 7.x series

    @aanderse
    aanderse committed Mar 28, 2019
    Copy the full SHA
    417da42 View commit details

Commits on Mar 29, 2019

  1. Merge pull request #58489 from aanderse/mailcatcher 

    nixos/mailcatcher: fix test to be compatible with mailcatcher 7.x series
    @Ma27
    Ma27 authored Mar 29, 2019
    Copy the full SHA
    673c819 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/tests/mailcatcher.nix
2 changes: 1 addition & 1 deletion nixos/tests/mailcatcher.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,6 @@ import ./make-test.nix ({ lib, ... }:
$machine->waitForUnit('mailcatcher.service');
$machine->waitForOpenPort('1025');
$machine->succeed('echo "this is the body of the email" | mail -s "subject" root@example.org');
$machine->succeed('curl http://localhost:1080/messages/1.json') =~ /this is the body of the email/ or die;
$machine->succeed('curl http://localhost:1080/messages/1.source') =~ /this is the body of the email/ or die;
'';
})