diff options
| author | Lars Thorsen <[email protected]> | 2015-05-20 10:12:46 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-05-20 10:12:46 +0200 |
| commit | 7b81ed532898c735ad8901723df373e5f0246127 (patch) | |
| tree | 5f69565b5016fb08d3bd62ecaf53fa12d4cb7c51 /erts/emulator/test/monitor_SUITE.erl | |
| parent | fd63f2b7108e2607e43d709e6d3885e4a7406ec8 (diff) | |
| parent | 5bd9afcd35d1a5c46dce8e75c650841a3061f45b (diff) | |
| download | otp-7b81ed532898c735ad8901723df373e5f0246127.tar.gz otp-7b81ed532898c735ad8901723df373e5f0246127.tar.bz2 otp-7b81ed532898c735ad8901723df373e5f0246127.zip | |
Merge branch 'master' of git-server:otp
Conflicts:
lib/orber/src/orber.app.src
Diffstat (limited to 'erts/emulator/test/monitor_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/monitor_SUITE.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/test/monitor_SUITE.erl b/erts/emulator/test/monitor_SUITE.erl index 07e2862b2a..dc215b1529 100644 --- a/erts/emulator/test/monitor_SUITE.erl +++ b/erts/emulator/test/monitor_SUITE.erl @@ -763,12 +763,10 @@ named_down(doc) -> ["Test that DOWN message for a named monitor isn't" " delivered until name has been unregistered"]; named_down(suite) -> []; named_down(Config) when is_list(Config) -> - ?line {A,B,C} = now(), ?line Name = list_to_atom(atom_to_list(?MODULE) ++ "-named_down-" - ++ integer_to_list(A) - ++ "-" ++ integer_to_list(B) - ++ "-" ++ integer_to_list(C)), + ++ integer_to_list(erlang:system_time(seconds)) + ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))), ?line Prio = process_flag(priority,high), %% Spawn a bunch of high prio cpu bound processes to prevent %% normal prio processes from terminating during the next |