Skip to content

Better error msg when both username and password are empty #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 8, 2018
Merged

Better error msg when both username and password are empty #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2ff3d1
Merge branch 'develop' of https://github.com/QualiSystems/CustomScrip…
asafc64 Sep 7, 2017
49da759
Better error msg when both username and password are empty
asafc64 Feb 8, 2018
0b807b6
Merge branch 'asaf_branch' of https://github.com/QualiSystems/CustomS…
asafc64 Feb 8, 2018
999c3d2
Merge branch 'develop' into asaf_branch
asafc64 Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package/cloudshell/cm/customscript/domain/linux_script_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ def connect(self):
key_stream = StringIO(self.target_host.access_key)
key_obj = RSAKey.from_private_key(key_stream)
self.session.connect(self.target_host.ip, username=self.target_host.username, pkey=key_obj)
else:
elif self.target_host.username:
raise Exception('Both password and access key are empty.')
else:
raise Exception('Machine credentials are empty.')
except NoValidConnectionsError as e:
error_code = next(e.errors.itervalues(), type('e', (object,), {'errno': 0})).errno
raise ExcutorConnectionError(error_code, e)
Expand Down
6 changes: 6 additions & 0 deletions package/tests/test_linux_script_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ def test_no_password_nor_pen_file(self):
executor.connect()
self.assertEqual('Both password and access key are empty.', e.exception.inner_error.message)

def test_no_password_no_pen_file_no_username(self):
executor = LinuxScriptExecutor(self.logger, self.host, self.cancel_sampler)
with self.assertRaises(Exception) as e:
executor.connect()
self.assertEqual('Machine credentials are empty.', e.exception.inner_error.message)

def test_create_temp_folder_success(self):
self._mock_session_answer(0,'tmp123','')
result = self.executor.create_temp_folder()
Expand Down