mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
339f2df1dd
We changed sync to use multiprocessing for parallel work. This broke the ssh proxy code as it's all based on threads. Rewrite the logic to be multiprocessing safe. Now instead of the module acting as a stateful object, callers have to instantiate a new ProxyManager class that holds all the state, an pass that down to any users. Bug: https://crbug.com/gerrit/12389 Change-Id: I4b1af116f7306b91e825d3c56fb4274c9b033562 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/305486 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Chris Mcdonald <cjmcdonald@google.com>
75 lines
2.7 KiB
Python
75 lines
2.7 KiB
Python
# Copyright 2019 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Unittests for the ssh.py module."""
|
|
|
|
import multiprocessing
|
|
import subprocess
|
|
import unittest
|
|
from unittest import mock
|
|
|
|
import ssh
|
|
|
|
|
|
class SshTests(unittest.TestCase):
|
|
"""Tests the ssh functions."""
|
|
|
|
def test_parse_ssh_version(self):
|
|
"""Check _parse_ssh_version() handling."""
|
|
ver = ssh._parse_ssh_version('Unknown\n')
|
|
self.assertEqual(ver, ())
|
|
ver = ssh._parse_ssh_version('OpenSSH_1.0\n')
|
|
self.assertEqual(ver, (1, 0))
|
|
ver = ssh._parse_ssh_version('OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.13, OpenSSL 1.0.1f 6 Jan 2014\n')
|
|
self.assertEqual(ver, (6, 6, 1))
|
|
ver = ssh._parse_ssh_version('OpenSSH_7.6p1 Ubuntu-4ubuntu0.3, OpenSSL 1.0.2n 7 Dec 2017\n')
|
|
self.assertEqual(ver, (7, 6))
|
|
|
|
def test_version(self):
|
|
"""Check version() handling."""
|
|
with mock.patch('ssh._run_ssh_version', return_value='OpenSSH_1.2\n'):
|
|
self.assertEqual(ssh.version(), (1, 2))
|
|
|
|
def test_context_manager_empty(self):
|
|
"""Verify context manager with no clients works correctly."""
|
|
with multiprocessing.Manager() as manager:
|
|
with ssh.ProxyManager(manager):
|
|
pass
|
|
|
|
def test_context_manager_child_cleanup(self):
|
|
"""Verify orphaned clients & masters get cleaned up."""
|
|
with multiprocessing.Manager() as manager:
|
|
with ssh.ProxyManager(manager) as ssh_proxy:
|
|
client = subprocess.Popen(['sleep', '964853320'])
|
|
ssh_proxy.add_client(client)
|
|
master = subprocess.Popen(['sleep', '964853321'])
|
|
ssh_proxy.add_master(master)
|
|
# If the process still exists, these will throw timeout errors.
|
|
client.wait(0)
|
|
master.wait(0)
|
|
|
|
def test_ssh_sock(self):
|
|
"""Check sock() function."""
|
|
manager = multiprocessing.Manager()
|
|
proxy = ssh.ProxyManager(manager)
|
|
with mock.patch('tempfile.mkdtemp', return_value='/tmp/foo'):
|
|
# old ssh version uses port
|
|
with mock.patch('ssh.version', return_value=(6, 6)):
|
|
self.assertTrue(proxy.sock().endswith('%p'))
|
|
|
|
proxy._sock_path = None
|
|
# new ssh version uses hash
|
|
with mock.patch('ssh.version', return_value=(6, 7)):
|
|
self.assertTrue(proxy.sock().endswith('%C'))
|