Skip to content

Commit 4db37d7

Browse files
committed
Fix log-level option
1 parent 5364b86 commit 4db37d7

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

icloudpd/logger.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import sys
44
import logging
5-
from logging import DEBUG, INFO
5+
from logging import INFO
66

77

88
class IPDLogger(logging.Logger):
@@ -32,11 +32,10 @@ def tqdm_write(self, message, loglevel=INFO):
3232
self.tqdm.write(message)
3333

3434

35-
def setup_logger(loglevel=DEBUG):
35+
def setup_logger():
3636
"""Set up logger and add stdout handler"""
3737
logging.setLoggerClass(IPDLogger)
3838
logger = logging.getLogger("icloudpd")
39-
logger.setLevel(loglevel)
4039
has_stdout_handler = False
4140
for handler in logger.handlers:
4241
if handler.name == "stdoutLogger":

tests/test_cli.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
import os
44
import shutil
55
from vcr import VCR
6+
import pytest
67
from click.testing import CliRunner
78
from icloudpd.base import main
89

910
vcr = VCR(decode_compressed_response=True)
1011

1112

1213
class CliTestCase(TestCase):
14+
@pytest.fixture(autouse=True)
15+
def inject_fixtures(self, caplog):
16+
self._caplog = caplog
17+
1318
def test_cli(self):
1419
runner = CliRunner()
1520
result = runner.invoke(main, ["--help"])
@@ -37,8 +42,11 @@ def test_log_levels(self):
3742
"tests/fixtures/Photos",
3843
],
3944
)
45+
self.assertNotIn("DEBUG", self._caplog.text)
46+
self.assertIn("INFO", self._caplog.text)
4047
assert result.exit_code == 0
4148
with vcr.use_cassette("tests/vcr_cassettes/listing_photos.yml"):
49+
self._caplog.clear()
4250
result = runner.invoke(
4351
main,
4452
[
@@ -54,6 +62,8 @@ def test_log_levels(self):
5462
"tests/fixtures/Photos",
5563
],
5664
)
65+
self.assertNotIn("DEBUG", self._caplog.text)
66+
self.assertNotIn("INFO", self._caplog.text)
5767
assert result.exit_code == 0
5868

5969
def test_tqdm(self):

0 commit comments

Comments
 (0)