x/tobiko
Code Issues Proposed changes

Merge "Source /etc/profile before importing env variables from remote host"

Browse Source
This commit is contained in:
Zuul 2022-07-20 20:04:43 +00:00 committed by Gerrit Code Review
commit ce2a8734f8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tobiko/shell/sh/_connection.py
View File

@ -443,7 +443,7 @@ class SSHShellConnection(ShellConnection):
@property @property
def username(self) -> str: def username(self) -> str:
return self.ssh_client.username return self.ssh_client.setup_connect_parameters()['username']
_hostname: typing.Optional[str] = None _hostname: typing.Optional[str] = None
@ -462,8 +462,9 @@ class SSHShellConnection(ShellConnection):
return self._sftp return self._sftp
def get_environ(self) -> typing.Dict[str, str]: def get_environ(self) -> typing.Dict[str, str]:
lines = self.execute('source /etc/profile; env').stdout.splitlines()
return dict(_parse_env_line(line) return dict(_parse_env_line(line)
for line in self.execute('env').stdout().splitlines() for line in lines
if line.strip()) if line.strip())
def put_file(self, local_file: str, remote_file: str): def put_file(self, local_file: str, remote_file: str):

2
tobiko/tests/functional/shell/sh/test_connection.py
View File

@ -234,7 +234,7 @@ class SSHShellConnectionTest(LocalShellConnectionTest):
@property @property
def username(self) -> str: def username(self) -> str:
return self.ssh_client.username return self.ssh_client.setup_connect_parameters()['username']
class CirrosShellConnectionTest(SSHShellConnectionTest): class CirrosShellConnectionTest(SSHShellConnectionTest):