aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-03 10:11:58 +0100
committerZandra <[email protected]>2015-12-03 10:13:58 +0100
commitd4bf329e7975eca4eab3522766785b3ae624aa8f (patch)
tree46cfb8b59e7f3e14d02ce0b21a61a47fc3df5db0 /lib
parentf96039f1c0cf59c2069f7e1acd1312fa22d6bab9 (diff)
downloadotp-d4bf329e7975eca4eab3522766785b3ae624aa8f.tar.gz
otp-d4bf329e7975eca4eab3522766785b3ae624aa8f.tar.bz2
otp-d4bf329e7975eca4eab3522766785b3ae624aa8f.zip
rm assertReceive, due to a leftover of a conflict resolution
c574bd33c39d91c487c3fcd819226ecfc46c13c8
Diffstat (limited to 'lib')
-rw-r--r--lib/eunit/include/eunit.hrl1
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.)