diff options
| author | Zandra <[email protected]> | 2015-12-04 10:26:39 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-12-04 10:26:39 +0100 |
| commit | 646d3d24a9031c96f726b9a2c715b6da144334c8 (patch) | |
| tree | 8100ef8a3329040f0c728e3b589feb5708a227cf | |
| parent | fc571c1a5d505902c15742e7c0db60288d63fcdb (diff) | |
| parent | d4bf329e7975eca4eab3522766785b3ae624aa8f (diff) | |
| download | otp-646d3d24a9031c96f726b9a2c715b6da144334c8.tar.gz otp-646d3d24a9031c96f726b9a2c715b6da144334c8.tar.bz2 otp-646d3d24a9031c96f726b9a2c715b6da144334c8.zip | |
Merge branch 'zandra/rm-eunit-assertReceive' into maint
* zandra/rm-eunit-assertReceive:
rm assertReceive, due to a leftover of a conflict resolution
| -rw-r--r-- | lib/eunit/include/eunit.hrl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl index 88e9d6c19b..8f678b0290 100644 --- a/lib/eunit/include/eunit.hrl +++ b/lib/eunit/include/eunit.hrl @@ -135,7 +135,6 @@ -define(_assertThrow(Term, Expr), ?_assertException(throw, Term, Expr)). -define(_assertNotException(Class, Term, Expr), ?_test(?assertNotException(Class, Term, Expr))). --define(_assertReceive(Guard, Expr), ?_test(?assertReceive(Guard, Expr))). %% Macros for running operating system commands. (Note that these %% require EUnit to be present at runtime, or at least eunit_lib.) |