61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
From 47cfed55575c21ac558e6d00a4ab1814406be651 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Levin <slev@altlinux.org>
|
|
Date: Sat, 4 Jun 2022 03:03:23 GMT+8
|
|
Subject: [PATCH] fix error in sftp testcase
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651
|
|
|
|
---
|
|
tests/__init__.py | 4 ++--
|
|
tests/test_sftp.py | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/__init__.py b/tests/__init__.py
|
|
index 9850f3c..2a9cb4b 100644
|
|
--- a/tests/__init__.py
|
|
+++ b/tests/__init__.py
|
|
@@ -36,7 +36,7 @@ def requireNonAsciiLocale(category_name="LC_ALL"):
|
|
def _decorate_with_locale(category, try_locales, test_method):
|
|
"""Decorate test_method to run after switching to a different locale."""
|
|
|
|
- def _test_under_locale(testself, sftp):
|
|
+ def _test_under_locale(testself, *args, **kwargs):
|
|
original = locale.setlocale(category)
|
|
while try_locales:
|
|
try:
|
|
@@ -46,7 +46,7 @@ def _decorate_with_locale(category, try_locales, test_method):
|
|
try_locales.pop(0)
|
|
else:
|
|
try:
|
|
- return test_method(testself)
|
|
+ return test_method(testself, *args, **kwargs)
|
|
finally:
|
|
locale.setlocale(category, original)
|
|
skipTest = getattr(testself, "skipTest", None)
|
|
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
|
|
index 0650e8d..b53ece7 100644
|
|
--- a/tests/test_sftp.py
|
|
+++ b/tests/test_sftp.py
|
|
@@ -277,7 +277,7 @@ class TestSFTP(object):
|
|
sftp.open(sftp.FOLDER + "/canard.txt", "w").close()
|
|
try:
|
|
folder_contents = sftp.listdir(sftp.FOLDER)
|
|
- self.assertEqual(["canard.txt"], folder_contents)
|
|
+ assert ["canard.txt"] == folder_contents
|
|
finally:
|
|
sftp.remove(sftp.FOLDER + "/canard.txt")
|
|
|
|
@@ -797,7 +797,7 @@ class TestSFTP(object):
|
|
"""Test SFTPAttributes under a locale with non-ascii time strings."""
|
|
some_stat = os.stat(sftp.FOLDER)
|
|
sftp_attributes = SFTPAttributes.from_stat(some_stat, u("a_directory"))
|
|
- self.assertTrue(b"a_directory" in sftp_attributes.asbytes())
|
|
+ assert b"a_directory" in sftp_attributes.asbytes()
|
|
|
|
def test_sftp_attributes_empty_str(self, sftp):
|
|
sftp_attributes = SFTPAttributes()
|
|
--
|
|
2.23.0
|
|
|