diff options
| author | Zandra Norman <[email protected]> | 2017-04-06 16:44:31 +0200 |
|---|---|---|
| committer | Zandra Norman <[email protected]> | 2017-04-06 16:44:31 +0200 |
| commit | 356d27670bba7e243ca214839b0787b351593ac6 (patch) | |
| tree | 52b19962423a72f9488041c78d5e49cfc7fdd7fe /lib/common_test | |
| parent | b54a0dc67a7b40853a0b6434d7788c424abd1c8e (diff) | |
| parent | 2e87251121d6c388947b6b1f53720cc37f05db44 (diff) | |
| download | otp-356d27670bba7e243ca214839b0787b351593ac6.tar.gz otp-356d27670bba7e243ca214839b0787b351593ac6.tar.bz2 otp-356d27670bba7e243ca214839b0787b351593ac6.zip | |
Merge branch 'tsloughter/ct_slave-nodename-inconsistency/PR-1095/OTP-13806'
* tsloughter/ct_slave-nodename-inconsistency/PR-1095/OTP-13806:
handle ct_slave nodename in the same way as net_kernel
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/src/ct_slave.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl index 571958ca03..4188bd7c3b 100644 --- a/lib/common_test/src/ct_slave.erl +++ b/lib/common_test/src/ct_slave.erl @@ -309,7 +309,12 @@ is_started(ENode) -> % make a Erlang node name from name and hostname enodename(Host, Node) -> - list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host)). + case lists:member($@, atom_to_list(Node)) of + true -> + Node; + false -> + list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host)) + end. % performs actual start of the "slave" node do_start(Host, Node, Options) -> |