Skip to content

utils: update remote-run for Python 3 compatibility #32510

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 1 commit into from
Jun 24, 2020
Merged

utils: update remote-run for Python 3 compatibility #32510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions utils/remote-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ class CommandRunner(object):
def send(self, local_to_remote_files):
# Prepare the remote directory structure.
# FIXME: This could be folded into the sftp connection below.
dirs_to_make = self._dirnames(local_to_remote_files.viewvalues())
dirs_to_make = self._dirnames(local_to_remote_files.values())
self.run_remote(['/bin/mkdir', '-p'] + dirs_to_make)

# Send the local files.
sftp_commands = ("-put {0} {1}".format(quote(local_file),
quote(remote_file))
for local_file, remote_file
in local_to_remote_files.viewitems())
in local_to_remote_files.items())
self.run_sftp(sftp_commands)

def fetch(self, local_to_remote_files):
# Prepare the local directory structure.
dirs_to_make = self._dirnames(local_to_remote_files.viewkeys())
dirs_to_make = self._dirnames(local_to_remote_files.keys())
mkdir_command = ['/bin/mkdir', '-p'] + dirs_to_make
if self.verbose:
print(' '.join(mkdir_command), file=sys.stderr)
Expand All @@ -64,11 +64,11 @@ class CommandRunner(object):
sftp_commands = ("-get {0} {1}".format(quote(remote_file),
quote(local_file))
for local_file, remote_file
in local_to_remote_files.viewitems())
in local_to_remote_files.items())
self.run_sftp(sftp_commands)

def run_remote(self, command, remote_env={}):
env_strings = ['{0}={1}'.format(k,v) for k,v in remote_env.viewitems()]
env_strings = ['{0}={1}'.format(k,v) for k,v in remote_env.items()]
remote_invocation = self.remote_invocation(
['/usr/bin/env'] + env_strings + command)
remote_proc = self.popen(remote_invocation, stdin=subprocess.PIPE,
Expand Down Expand Up @@ -213,16 +213,16 @@ def main():
remote_dir = posixpath.join(args.remote_dir, args.remote_input_prefix)
input_files = find_transfers(args.command, args.input_prefix,
remote_dir)
assert not any(upload_files.has_key(f) for f in input_files)
assert not any(f in upload_files for f in input_files)
upload_files.update(input_files)
if args.output_prefix:
assert not args.remote_output_prefix.startswith("..")
remote_dir = posixpath.join(args.remote_dir, args.remote_output_prefix)
test_files = find_transfers(args.command, args.output_prefix,
remote_dir)
assert not any(upload_files.has_key(f) for f in test_files)
assert not any(f in upload_files for f in test_files)
upload_files.update(test_files)
assert not any(download_files.has_key(f) for f in test_files)
assert not any(f in download_files for f in test_files)
download_files.update(test_files)
remote_test_specific_dir = remote_dir

Expand Down