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/ct_slave.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/ct_slave.erl')
| -rw-r--r-- | lib/common_test/src/ct_slave.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl index 3ad3937548..571958ca03 100644 --- a/lib/common_test/src/ct_slave.erl +++ b/lib/common_test/src/ct_slave.erl @@ -325,7 +325,7 @@ do_start(Host, Node, Options) -> Functions end, MasterHost = gethostname(), - if + _ = if MasterHost == Host -> spawn_local_node(Node, Options); true-> @@ -359,7 +359,7 @@ do_start(Host, Node, Options) -> pang-> {error, boot_timeout, ENode} end, - case Result of + _ = case Result of {ok, ENode}-> ok; {error, Timeout, ENode} @@ -422,7 +422,7 @@ spawn_remote_node(Host, Node, Options) -> {_, _}-> [{user, Username}, {password, Password}] end ++ [{silently_accept_hosts, true}] ++ SSHOpts, - application:ensure_all_started(ssh), + {ok, _} = application:ensure_all_started(ssh), {ok, SSHConnRef} = ssh:connect(atom_to_list(Host), SSHPort, SSHOptions), {ok, SSHChannelId} = ssh_connection:session_channel(SSHConnRef, infinity), ssh_setenv(SSHConnRef, SSHChannelId, Env), |