Differential D588

Fix ssh output being skipped often
ClosedPublic
Actions

Authored by mkrizek on Sep 15 2015, 9:49 PM.

Details

Reviewers
lbrabec
kparal
tflink
jskladan
Maniphest Tasks
T597: ssh output from paramiko is cropped or skipped often
Commits
rLTRN5e3f11f9ca62: Fix ssh output being skipped often
Summary

Fix tests

Test Plan

Tried examples given by kparal in the ticket, worked.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Fix ssh output being skipped often.Sep 15 2015, 9:49 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal, jskladan, lbrabec.
kparal accepted this revision.Sep 16 2015, 10:07 AM
This revision is now accepted and ready to land.Sep 16 2015, 10:07 AM
jskladan accepted this revision.Sep 16 2015, 10:13 AM

apart of the nit, lgtm

testing/test_remote_exec.py
132

Maybe add a comment explaining, to us lower mortals, why read=lambda: '' is important here, pls.

kparal added inline comments.Sep 16 2015, 1:39 PM
testing/test_remote_exec.py
132

Because his patch added code which uses .read() method on these objects. Martin could have used Dingus for this, but Bunch works here as well for these simple use cases.

PS: Bunch is so outdated, cool kids use Munch these days!

kparal added inline comments.Sep 16 2015, 2:34 PM
testing/test_remote_exec.py
132

Please note D593. Let's change to munch?

Closed by commit rLTRN5e3f11f9ca62: Fix ssh output being skipped often (authored by mkrizek). · Explain WhySep 16 2015, 6:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1542

View Options

libtaskotron/remote_exec.py

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Line(s)139 if channel.recv_ready():
141 self.outstream.write(data) 141​ self.outstream.write(data)
142 if channel.recv_stderr_ready(): 142​ if channel.recv_stderr_ready():
143 data = channel.recv_stderr(1024) 143​ data = channel.recv_stderr(1024)
144 self.outstream.write(data) 144​ self.outstream.write(data)
145 sleep(0.1) 145​ sleep(0.1)
146 146​
147 retcode = channel.recv_exit_status() 147​ retcode = channel.recv_exit_status()
148 148​
149​ # read the rest of data that was left in the buffers
150​ self.outstream.write(stdout.read())
151​ self.outstream.write(stderr.read())
152​
149 if retcode != 0 and retcode != exitcode_directive.FAILURE: 153​ if retcode != 0 and retcode != exitcode_directive.FAILURE:
150 raise exc.TaskotronRemoteError('Command "%s" on %s@%s exited with code %s' % 154​ raise exc.TaskotronRemoteError('Command "%s" on %s@%s exited with code %s' %
151 (cmd, self.username, self.hostname, retcode)) 155​ (cmd, self.username, self.hostname, retcode))
152 return retcode 156​ return retcode
153 157​
154 def install_pkgs(self, pkgs): 158​ def install_pkgs(self, pkgs):
155 '''Install packages via dnf. 159​ '''Install packages via dnf.
156 160​
▲ Show 20 Lines • Show All 160 Lines • Show Last 20 Lines
View Options

testing/test_remote_exec.py

Show First 20 Lines • Show All 123 Lines • ▼ Show 20 Line(s)107class StubSSHClient(object):
124 124​
125 def open_sftp(self, *args, **kwargs): 125​ def open_sftp(self, *args, **kwargs):
126 if self._sftp is None: 126​ if self._sftp is None:
127 self._sftp = StubSFTPClient() 127​ self._sftp = StubSFTPClient()
128 128​
129 return self._sftp 129​ return self._sftp
130 130​
131 def exec_command(self, cmd): 131​ def exec_command(self, cmd):
132 ch = Munch(channel=StubChannel(cmd)) 132​ ch = Munch(channel=StubChannel(cmd), read=lambda: '')
jskladanUnsubmitted
Not Done

Maybe add a comment explaining, to us lower mortals, why read=lambda: '' is important here, pls.

kparalUnsubmitted
Not Done

Because his patch added code which uses .read() method on these objects. Martin could have used Dingus for this, but Bunch works here as well for these simple use cases.

PS: Bunch is so outdated, cool kids use Munch these days!

kparalUnsubmitted
Not Done

Please note D593. Let's change to munch?

133 133​
134 return ch, ch, ch 134​ return ch, ch, ch
135 135​
136 136​
137class TestRemoteExec(object): 137​class TestRemoteExec(object):
138 def setup_method(self, method): 138​ def setup_method(self, method):
139 '''Run this before every test invocation''' 139​ '''Run this before every test invocation'''
140 self.ref_host_ip = '192.168.122.22' 140​ self.ref_host_ip = '192.168.122.22'
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines