diff options
author | Zandra Hird <[email protected]> | 2016-06-09 14:40:22 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2016-06-09 14:40:22 +0200 |
commit | 75e5cdabbcaaa12f043225ca8d361055a9d47b24 (patch) | |
tree | 6c3abd0e228d33dcd7f40d909fda885fea2b8738 /lib/common_test/src/test_server_ctrl.erl | |
parent | 6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13 (diff) | |
parent | 02564a09a8df4cd0cd8e6e53b7e3a3107e3229d7 (diff) | |
download | otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.gz otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.bz2 otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.zip |
Merge branch 'zandra/common_test/unmatched_returns/OTP-13345'
* zandra/common_test/unmatched_returns/OTP-13345: (23 commits)
ct logs: Fix unmatched_return warnings
ct_util: Fix unmatched_return warnings
erl2html2: Fix unmatched_return warnings
cth_conn_log: Fix unmatched_return warnings
ct_webtool: Fix unmatched_return warnings
ct_telnet: Fix unmatched_return warnings
ct_ssh: Fix unmatched_return warnings
ct_snmp: Fix unmatched_return warnings
ct_slave: Fix unmatched_return warnings
ct_rpc: Fix unmatched_return warnings
ct_repeat: Fix unmatched_return warnings
ct_release_test: Fix unmatched_return warnings
ct_property_test: Fix unmatched_return warnings
ct_master: Fix unmatched_return warnings
ct_hooks_lock: Fix unmatched_return warnings
ct_hooks: Fix unmatched_return warnings
ct_groups: Fix unmatched_return warnings
ct_ftp: Fix unmatched_return warnings
ct_framework: Fix unmatched_return warnings
ct_config: Fix unmatched_return warnings
...
Diffstat (limited to 'lib/common_test/src/test_server_ctrl.erl')
-rw-r--r-- | lib/common_test/src/test_server_ctrl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl index 84e35e7371..b52e4bef9b 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -294,7 +294,7 @@ start_link(_) -> start() -> case gen_server:start({local,?MODULE}, ?MODULE, [], []) of - {ok, Pid} -> + {error, {already_started, Pid}} -> {ok, Pid}; Other -> Other @@ -302,7 +302,7 @@ start() -> start_link() -> case gen_server:start_link({local,?MODULE}, ?MODULE, [], []) of - {ok, Pid} -> + {error, {already_started, Pid}} -> {ok, Pid}; Other -> Other |