mirror of https://github.com/tqdm/tqdm.git
tests: fix py38, py39
This commit is contained in:
parent
424f5eb79b
commit
40d59c2ec4
|
@ -6,16 +6,13 @@ from tempfile import mkdtemp
|
||||||
import sys
|
import sys
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
from pytest import mark
|
||||||
|
|
||||||
from tqdm.cli import main, TqdmKeyError, TqdmTypeError
|
from tqdm.cli import main, TqdmKeyError, TqdmTypeError
|
||||||
from tqdm.utils import IS_WIN
|
from tqdm.utils import IS_WIN
|
||||||
from .tests_tqdm import skip, _range, closing, UnicodeIO, StringIO, BytesIO
|
from .tests_tqdm import skip, _range, closing, UnicodeIO, StringIO, BytesIO
|
||||||
|
|
||||||
|
|
||||||
def _sh(*cmd, **kwargs):
|
|
||||||
return subprocess.Popen(cmd, stdout=subprocess.PIPE,
|
|
||||||
**kwargs).communicate()[0].decode('utf-8')
|
|
||||||
|
|
||||||
|
|
||||||
class Null(object):
|
class Null(object):
|
||||||
def __call__(self, *_, **__):
|
def __call__(self, *_, **__):
|
||||||
return self
|
return self
|
||||||
|
@ -29,15 +26,22 @@ NULL = Null()
|
||||||
|
|
||||||
def test_pipes():
|
def test_pipes():
|
||||||
"""Test command line pipes"""
|
"""Test command line pipes"""
|
||||||
ls_out = _sh('ls').replace('\r\n', '\n')
|
ls_out = subprocess.check_output(['ls'])
|
||||||
ls = subprocess.Popen('ls', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
ls = subprocess.Popen(['ls'], stdout=subprocess.PIPE)
|
||||||
res = _sh(sys.executable, '-c', 'from tqdm.cli import main; main()',
|
res = subprocess.Popen(
|
||||||
stdin=ls.stdout, stderr=subprocess.STDOUT)
|
[sys.executable, '-c', 'from tqdm.cli import main; main()'],
|
||||||
ls.wait()
|
stdin=ls.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
out, err = res.communicate()[:2]
|
||||||
|
assert ls.poll() == 0
|
||||||
|
|
||||||
# actual test:
|
# actual test:
|
||||||
|
assert ls_out.replace(b"\r\n", b"\n") == out.replace(b"\r\n", b"\n")
|
||||||
|
assert b"it/s" in err
|
||||||
|
|
||||||
assert ls_out in res.replace('\r\n', '\n')
|
|
||||||
|
if sys.version_info[:2] >= (3, 8):
|
||||||
|
test_pipes = mark.filterwarnings("ignore:unclosed file:ResourceWarning")(
|
||||||
|
test_pipes)
|
||||||
|
|
||||||
|
|
||||||
# WARNING: this should be the last test as it messes with sys.stdin, argv
|
# WARNING: this should be the last test as it messes with sys.stdin, argv
|
||||||
|
|
|
@ -200,6 +200,7 @@ def test_imap():
|
||||||
|
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
res = list(tqdm(pool.imap(incr, range(100)), disable=True))
|
res = list(tqdm(pool.imap(incr, range(100)), disable=True))
|
||||||
|
pool.close()
|
||||||
assert res[-1] == 100
|
assert res[-1] == 100
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue