14
0
forked from pool/python-pycurl
2018-07-10 11:11:33 +00:00
committed by Git OBS Bridge
parent 35703003f8
commit 7ebe19c858
5 changed files with 56 additions and 22 deletions

View File

@@ -1,8 +1,6 @@
Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py
===================================================================
--- pycurl-7.43.0.1.orig/tests/ssh_key_cb_test.py 2017-12-03 20:03:17.000000000 +0100
+++ pycurl-7.43.0.1/tests/ssh_key_cb_test.py 2018-01-30 16:56:42.499858079 +0100
@@ -30,8 +30,11 @@ class SshKeyCbTest(unittest.TestCase):
--- a/tests/ssh_key_cb_test.py
+++ b/tests/ssh_key_cb_test.py
@@ -33,8 +33,11 @@ class SshKeyCbTest(unittest.TestCase):
def keyfunction(known_key, found_key, match):
return pycurl.KHSTAT_FINE
@@ -16,7 +14,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py
try:
self.curl.perform()
@@ -44,8 +47,11 @@ class SshKeyCbTest(unittest.TestCase):
@@ -47,8 +50,11 @@ class SshKeyCbTest(unittest.TestCase):
def keyfunction(known_key, found_key, match):
return pycurl.KHSTAT_REJECT
@@ -30,7 +28,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py
try:
self.curl.perform()
@@ -58,8 +64,11 @@ class SshKeyCbTest(unittest.TestCase):
@@ -62,8 +68,11 @@ class SshKeyCbTest(unittest.TestCase):
def keyfunction(known_key, found_key, match):
return 'bogus'
@@ -44,9 +42,9 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py
try:
self.curl.perform()
@@ -77,8 +86,14 @@ class SshKeyCbUnsetTest(unittest.TestCas
@@ -82,9 +91,15 @@ class SshKeyCbUnsetTest(unittest.TestCas
@util.min_libcurl(7, 19, 6)
@util.guard_unknown_libcurl_option
def test_keyfunction_none(self):
- self.curl.setopt(pycurl.SSH_KEYFUNCTION, None)
+ try:
@@ -55,6 +53,7 @@ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py
+ self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0])
@util.min_libcurl(7, 19, 6)
@util.guard_unknown_libcurl_option
def test_keyfunction_unset(self):
- self.curl.unsetopt(pycurl.SSH_KEYFUNCTION)
+ try: