diff options
| author | Peter Andersson <[email protected]> | 2010-06-03 14:40:16 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:21 +0200 |
| commit | 5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45 (patch) | |
| tree | b6b0007b983b94746087542b4ef13ff79b794c05 /lib/common_test/test/ct_master_SUITE.erl | |
| parent | 7c6504029f84c52de40a6b29b2fd1b17c053ccec (diff) | |
| download | otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.tar.gz otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.tar.bz2 otp-5d01bdc2c4c3cc18150711ebfab4c84abdfc0b45.zip | |
Improve and fix various test suites
Diffstat (limited to 'lib/common_test/test/ct_master_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_master_SUITE.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl index 2d4a29cde1..8d3ed8c45c 100644 --- a/lib/common_test/test/ct_master_SUITE.erl +++ b/lib/common_test/test/ct_master_SUITE.erl @@ -69,13 +69,14 @@ all(suite) -> ct_master_test(Config) when is_list(Config)-> NodeCount = 5, DataDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), NodeNames = [list_to_atom("testnode_"++integer_to_list(N)) || N <- lists:seq(1, NodeCount)], - FileName = filename:join(DataDir, "ct_master_spec.spec"), + FileName = filename:join(PrivDir, "ct_master_spec.spec"), Suites = [master_SUITE], TSFile = make_spec(DataDir, FileName, NodeNames, Suites, Config), [{TSFile, ok}] = run_test(ct_master_test, FileName, Config), - file:delete(filename:join(DataDir, FileName)). + ok. %%%----------------------------------------------------------------- %%% HELP FUNCTIONS @@ -91,9 +92,9 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config)-> C = lists:map(fun(NodeName)-> Rnd = random:uniform(2), if Rnd == 1-> - {config, NodeName, "master/config.txt"}; + {config, NodeName, filename:join(DataDir, "master/config.txt")}; true-> - {userconfig, NodeName, {ct_config_xml, "master/config.xml"}} + {userconfig, NodeName, {ct_config_xml, filename:join(DataDir, "master/config.xml")}} end end, NodeNames), @@ -115,7 +116,7 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config)-> end, NodeNames) ++ [{logdir, master, PrivDir}], - ct_test_support:write_testspec(N++C++S++LD++NS, DataDir, FileName). + ct_test_support:write_testspec(N++C++S++LD++NS, FileName). get_log_dir(PrivDir, NodeName)-> LogDir = filename:join(PrivDir, io_lib:format("slave.~p", [NodeName])), |