diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-07 16:05:44 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-07 16:05:44 +0200 |
| commit | 7b9a2c6b90cc6f41b0f42198e474a9322a4f2a94 (patch) | |
| tree | 158dc4272926aed7736c71b73a2c7a029caf12ae /lib/test_server | |
| parent | 71a03b51143aa8fe0a3dcd0701ede5c087a9aa9b (diff) | |
| parent | c0739409997961f358656fc4cd5bf7abfef5f858 (diff) | |
| download | otp-7b9a2c6b90cc6f41b0f42198e474a9322a4f2a94.tar.gz otp-7b9a2c6b90cc6f41b0f42198e474a9322a4f2a94.tar.bz2 otp-7b9a2c6b90cc6f41b0f42198e474a9322a4f2a94.zip | |
Merge branch 'egil/fix-ts_install-hook'
* egil/fix-ts_install-hook:
test_server: Fix install_hook
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/ts_install_cth.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl index 3dfa6174fe..54ca69637e 100644 --- a/lib/test_server/src/ts_install_cth.erl +++ b/lib/test_server/src/ts_install_cth.erl @@ -238,9 +238,15 @@ generate_nodenames2(0, _Hosts, Acc) -> Acc; generate_nodenames2(N, Hosts, Acc) -> Host=lists:nth((N rem (length(Hosts)))+1, Hosts), - Name=list_to_atom(temp_nodename("nod") ++ "@" ++ Host), + Name=list_to_atom(temp_nodename("nod",N) ++ "@" ++ Host), generate_nodenames2(N-1, Hosts, [Name|Acc]). -temp_nodename(Base) -> - Num = erlang:unique_integer([positive]), - Base ++ integer_to_list(Num). +%% We cannot use erlang:unique_integer([positive]) +%% here since this code in run on older test releases as well. +temp_nodename(Base,I) -> + {A,B,C} = os:timestamp(), + Nstr = integer_to_list(I), + Astr = integer_to_list(A), + Bstr = integer_to_list(B), + Cstr = integer_to_list(C), + Base++Nstr++Astr++Bstr++Cstr. |