aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/test/test_server_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-04-10 09:41:27 +0200
committerSiri Hansen <[email protected]>2013-04-10 09:41:27 +0200
commit407973227d29a53f5c886d61439f0fa9647e3824 (patch)
tree067e778cdaf49d45e9c9f85b1033920252f8409e /lib/test_server/test/test_server_SUITE.erl
parent2827f483ca0173b1cf54a67c00556afcd8cfd4ef (diff)
parentd6782afcbcd1658e0ffd86f08057befd4c37edcd (diff)
downloadotp-407973227d29a53f5c886d61439f0fa9647e3824.tar.gz
otp-407973227d29a53f5c886d61439f0fa9647e3824.tar.bz2
otp-407973227d29a53f5c886d61439f0fa9647e3824.zip
Merge branch 'siri/common_test/unexpected_io/OTP-10494' into maint
* siri/common_test/unexpected_io/OTP-10494: [common_test] Add test for unexpected I/O [common_test] Send unexpected logging to test_server's unexpected_io.log [test_server] Add test_server_io:print_unexpected/1
Diffstat (limited to 'lib/test_server/test/test_server_SUITE.erl')
-rw-r--r--lib/test_server/test/test_server_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index cf1df6df34..3db2f5f9f1 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -104,7 +104,7 @@ test_server_SUITE(Config) ->
% rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
run_test_server_tests("test_server_SUITE",
[{test_server_SUITE,skip_case7,"SKIPPED!"}],
- 39, 1, 31, 20, 9, 1, 11, 2, 26, Config).
+ 40, 1, 32, 21, 9, 1, 11, 2, 27, Config).
test_server_parallel01_SUITE(Config) ->
run_test_server_tests("test_server_parallel01_SUITE", [],