Skip to content

Commit c13f7d5

Browse files
wallisyanJacksonTian
authored andcommitted
Fix warning;add logger case (aliyun#188)
* fix warning * add logger case * Update logger_test.py
1 parent 3fdb639 commit c13f7d5

File tree

2 files changed

+36
-1
lines changed
  • aliyun-python-sdk-core/aliyunsdkcore/vendored/requests/packages/urllib3/packages
  • python-sdk-functional-test

2 files changed

+36
-1
lines changed

aliyun-python-sdk-core/aliyunsdkcore/vendored/requests/packages/urllib3/packages/socks.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@
5555
"""
5656

5757
from base64 import b64encode
58-
from collections import Callable
58+
try:
59+
from collections.abc import Callable
60+
except ImportError:
61+
from collections import Callable
5962
from errno import EOPNOTSUPP, EINVAL, EAGAIN
6063
import functools
6164
from io import BytesIO
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# encoding:utf-8
2+
import logging
3+
import os
4+
import tempfile
5+
6+
import mock
7+
from base import SDKTestBase
8+
9+
10+
class LoggerTest(SDKTestBase):
11+
12+
def test_file_logger(self):
13+
tempdir = tempfile.mkdtemp()
14+
temp_file = os.path.join(tempdir, 'file_logger')
15+
self.client.set_file_logger(log_level=logging.DEBUG, path=temp_file)
16+
from aliyunsdkecs.request.v20140526.DescribeRegionsRequest import DescribeRegionsRequest
17+
request = DescribeRegionsRequest()
18+
self.client.do_action_with_exception(request)
19+
self.assertTrue(os.path.isfile(temp_file))
20+
with open(temp_file) as logfile:
21+
s = logfile.read()
22+
self.assertTrue('aliyunsdkcore.client DEBUG Request received.' in s)
23+
24+
@mock.patch('logging.getLogger')
25+
@mock.patch('logging.StreamHandler')
26+
@mock.patch('logging.Formatter')
27+
def test_stream_logger(self, formatter, handler, get_logger):
28+
self.client.set_stream_logger(logger_name='foo.bar', log_level=40, format_string='foo')
29+
get_logger.assert_called_with('foo.bar')
30+
get_logger.return_value.setLevel.assert_called_with(logging.ERROR)
31+
formatter.assert_called_with('foo')
32+

0 commit comments

Comments
 (0)