|
|
b18fa3 |
From cc0107b311f74c78bd653fa1a84e2dcedce9fc6f Mon Sep 17 00:00:00 2001
|
|
|
b18fa3 |
From: Tomas Orsava <torsava@redhat.com>
|
|
|
b18fa3 |
Date: Thu, 3 Oct 2019 16:17:37 +0200
|
|
|
b18fa3 |
Subject: [PATCH] Modify tests to run in pytest
|
|
|
b18fa3 |
|
|
|
b18fa3 |
---
|
|
|
b18fa3 |
test_requests.py | 16 ++++++----------
|
|
|
b18fa3 |
1 file changed, 6 insertions(+), 10 deletions(-)
|
|
|
b18fa3 |
|
|
|
b18fa3 |
diff --git a/test_requests.py b/test_requests.py
|
|
|
b18fa3 |
index 15406a2..74aa5b3 100755
|
|
|
b18fa3 |
--- a/test_requests.py
|
|
|
b18fa3 |
+++ b/test_requests.py
|
|
|
b18fa3 |
@@ -7,7 +7,6 @@ from __future__ import division
|
|
|
b18fa3 |
import json
|
|
|
b18fa3 |
import os
|
|
|
b18fa3 |
import pickle
|
|
|
b18fa3 |
-import unittest
|
|
|
b18fa3 |
import collections
|
|
|
b18fa3 |
|
|
|
b18fa3 |
import io
|
|
|
b18fa3 |
@@ -53,7 +52,7 @@ def httpbin(*suffix):
|
|
|
b18fa3 |
return urljoin(HTTPBIN, '/'.join(suffix))
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class RequestsTestCase(unittest.TestCase):
|
|
|
b18fa3 |
+class TestCase():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
_multiprocess_can_split_ = True
|
|
|
b18fa3 |
|
|
|
b18fa3 |
@@ -1070,7 +1069,7 @@ class RequestsTestCase(unittest.TestCase):
|
|
|
b18fa3 |
assert len(list(r.iter_lines())) == 3
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class TestContentEncodingDetection(unittest.TestCase):
|
|
|
b18fa3 |
+class TestContentEncodingDetection():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
def test_none(self):
|
|
|
b18fa3 |
encodings = requests.utils.get_encodings_from_content('')
|
|
|
b18fa3 |
@@ -1114,7 +1113,7 @@ class TestContentEncodingDetection(unittest.TestCase):
|
|
|
b18fa3 |
assert encodings == ['HTML5', 'HTML4', 'XML']
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class TestCaseInsensitiveDict(unittest.TestCase):
|
|
|
b18fa3 |
+class TestCaseInsensitiveDict():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
def test_mapping_init(self):
|
|
|
b18fa3 |
cid = CaseInsensitiveDict({'Foo': 'foo', 'BAr': 'bar'})
|
|
|
b18fa3 |
@@ -1252,7 +1251,7 @@ class TestCaseInsensitiveDict(unittest.TestCase):
|
|
|
b18fa3 |
assert frozenset(cid) == keyset
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class UtilsTestCase(unittest.TestCase):
|
|
|
b18fa3 |
+class UtilsTestCase():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
def test_super_len_io_streams(self):
|
|
|
b18fa3 |
""" Ensures that we properly deal with different kinds of IO streams. """
|
|
|
b18fa3 |
@@ -1376,7 +1375,7 @@ class UtilsTestCase(unittest.TestCase):
|
|
|
b18fa3 |
assert quoted == requote_uri(quoted)
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class TestMorselToCookieExpires(unittest.TestCase):
|
|
|
b18fa3 |
+class TestMorselToCookieExpires():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
"""Tests for morsel_to_cookie when morsel contains expires."""
|
|
|
b18fa3 |
|
|
|
b18fa3 |
@@ -1413,7 +1412,7 @@ class TestMorselToCookieExpires(unittest.TestCase):
|
|
|
b18fa3 |
assert cookie.expires is None
|
|
|
b18fa3 |
|
|
|
b18fa3 |
|
|
|
b18fa3 |
-class TestMorselToCookieMaxAge(unittest.TestCase):
|
|
|
b18fa3 |
+class TestMorselToCookieMaxAge():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
"""Tests for morsel_to_cookie when morsel contains max-age."""
|
|
|
b18fa3 |
|
|
|
b18fa3 |
@@ -1634,6 +1633,3 @@ def test_vendor_aliases():
|
|
|
b18fa3 |
|
|
|
b18fa3 |
with pytest.raises(ImportError):
|
|
|
b18fa3 |
from requests.packages import webbrowser
|
|
|
b18fa3 |
-
|
|
|
b18fa3 |
-if __name__ == '__main__':
|
|
|
b18fa3 |
- unittest.main()
|
|
|
b18fa3 |
--
|
|
|
b18fa3 |
2.20.1
|
|
|
b18fa3 |
|