diff options
author | Mike Frysinger <vapier@google.com> | 2021-05-05 15:53:03 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2021-05-06 19:09:16 +0000 |
commit | 5291eafa412117b80ebbf645fc51559dd0b2caaf (patch) | |
tree | f92dd1030f36cbf8aaa3c208bee7b94cd9c72927 /tests/test_git_command.py | |
parent | 8e768eaaa722a99405f6542ac718880c8c22f060 (diff) | |
download | git-repo-5291eafa412117b80ebbf645fc51559dd0b2caaf.tar.gz |
ssh: move all ssh logic to a common place
We had ssh logic sprinkled between two git modules, and neither was
quite the right home for it. This largely moves the logic as-is to
its new home. We'll leave major refactoring to followup commits.
Bug: https://crbug.com/gerrit/12389
Change-Id: I300a8f7dba74f2bd132232a5eb1e856a8490e0e9
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/305483
Reviewed-by: Chris Mcdonald <cjmcdonald@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'tests/test_git_command.py')
-rw-r--r-- | tests/test_git_command.py | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tests/test_git_command.py b/tests/test_git_command.py index 76c092f4..93300a6f 100644 --- a/tests/test_git_command.py +++ b/tests/test_git_command.py | |||
@@ -26,38 +26,6 @@ import git_command | |||
26 | import wrapper | 26 | import wrapper |
27 | 27 | ||
28 | 28 | ||
29 | class SSHUnitTest(unittest.TestCase): | ||
30 | """Tests the ssh functions.""" | ||
31 | |||
32 | def test_parse_ssh_version(self): | ||
33 | """Check parse_ssh_version() handling.""" | ||
34 | ver = git_command._parse_ssh_version('Unknown\n') | ||
35 | self.assertEqual(ver, ()) | ||
36 | ver = git_command._parse_ssh_version('OpenSSH_1.0\n') | ||
37 | self.assertEqual(ver, (1, 0)) | ||
38 | ver = git_command._parse_ssh_version('OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.13, OpenSSL 1.0.1f 6 Jan 2014\n') | ||
39 | self.assertEqual(ver, (6, 6, 1)) | ||
40 | ver = git_command._parse_ssh_version('OpenSSH_7.6p1 Ubuntu-4ubuntu0.3, OpenSSL 1.0.2n 7 Dec 2017\n') | ||
41 | self.assertEqual(ver, (7, 6)) | ||
42 | |||
43 | def test_ssh_version(self): | ||
44 | """Check ssh_version() handling.""" | ||
45 | with mock.patch('git_command._run_ssh_version', return_value='OpenSSH_1.2\n'): | ||
46 | self.assertEqual(git_command.ssh_version(), (1, 2)) | ||
47 | |||
48 | def test_ssh_sock(self): | ||
49 | """Check ssh_sock() function.""" | ||
50 | with mock.patch('tempfile.mkdtemp', return_value='/tmp/foo'): | ||
51 | # old ssh version uses port | ||
52 | with mock.patch('git_command.ssh_version', return_value=(6, 6)): | ||
53 | self.assertTrue(git_command.ssh_sock().endswith('%p')) | ||
54 | git_command._ssh_sock_path = None | ||
55 | # new ssh version uses hash | ||
56 | with mock.patch('git_command.ssh_version', return_value=(6, 7)): | ||
57 | self.assertTrue(git_command.ssh_sock().endswith('%C')) | ||
58 | git_command._ssh_sock_path = None | ||
59 | |||
60 | |||
61 | class GitCallUnitTest(unittest.TestCase): | 29 | class GitCallUnitTest(unittest.TestCase): |
62 | """Tests the _GitCall class (via git_command.git).""" | 30 | """Tests the _GitCall class (via git_command.git).""" |
63 | 31 | ||