-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
4 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,9 +55,7 @@ def test_generate_and_upload_keypair__exit_code_0( | |
| '-f', | ||
| os.path.expanduser('~') + '{0}.ssh{0}aws-eb-us-west-2'.format(os.path.sep), | ||
| '-C', | ||
| 'aws-eb-us-west-2', | ||
| '-o', | ||
| 'IdentitiesOnly yes' | ||
| 'aws-eb-us-west-2' | ||
| ] | ||
| ) | ||
|
|
||
|
|
@@ -84,8 +82,6 @@ def test_generate_and_upload_keypair__exit_code_1( | |
| os.path.expanduser('~') + '{0}.ssh{0}aws-eb-us-west-2'.format(os.path.sep), | ||
| '-C', | ||
| 'aws-eb-us-west-2', | ||
| '-o', | ||
| 'IdentitiesOnly yes' | ||
| ] | ||
| ) | ||
|
|
||
|
|
@@ -324,7 +320,7 @@ def test_ssh_into_instance__uses_private_address( | |
| call_mock.return_value = 0 | ||
|
|
||
| sshops.ssh_into_instance('instance-id') | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]', '-o', 'IdentitiesOnly yes']) | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]']) | ||
|
|
||
| @mock.patch('ebcli.operations.sshops.ec2.describe_instance') | ||
| @mock.patch('ebcli.operations.sshops.ec2.describe_security_group') | ||
|
|
@@ -350,7 +346,7 @@ def test_ssh_into_instance__ssh_rule_exists( | |
| sshops.ssh_into_instance('instance-id') | ||
| authorize_ssh_mock.assert_not_called() | ||
| revoke_ssh_mock.assert_not_called() | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]', '-o', 'IdentitiesOnly yes']) | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]']) | ||
|
|
||
| @mock.patch('ebcli.operations.sshops.ec2.describe_instance') | ||
| @mock.patch('ebcli.operations.sshops.ec2.describe_security_group') | ||
|
|
@@ -376,7 +372,7 @@ def test_ssh_into_instance__no_ssh_rule_exists( | |
| sshops.ssh_into_instance('instance-id') | ||
| authorize_ssh_mock.assert_called_once_with('sg-12312313') | ||
| revoke_ssh_mock.assert_called_once_with('sg-12312313') | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]','-o', 'IdentitiesOnly yes']) | ||
| call_mock.assert_called_once_with(['ssh', '-i', 'aws-eb-us-west-2', '[email protected]']) | ||
|
|
||
| @mock.patch('ebcli.operations.sshops.prompt_for_ec2_keyname') | ||
| @mock.patch('ebcli.operations.sshops.commonops.update_environment') | ||
|
|
||