Skip to content
Snippets Groups Projects
Commit 14317f58 authored by Chris Lamb's avatar Chris Lamb :eyes:
Browse files

tests.test_progress: flake8 file

parent 720305c7
No related branches found
No related tags found
No related merge requests found
...@@ -22,10 +22,11 @@ import sys ...@@ -22,10 +22,11 @@ import sys
import json import json
import pytest import pytest
from distutils.version import LooseVersion
from diffoscope.main import main from diffoscope.main import main
from diffoscope.progress import ProgressManager, StatusFD from diffoscope.progress import ProgressManager, StatusFD
from distutils.version import LooseVersion as vcls
from .utils.tools import skip_unless_module_exists from .utils.tools import skip_unless_module_exists
TEST_TAR1_PATH = os.path.join(os.path.dirname(__file__), 'data', 'test1.tar') TEST_TAR1_PATH = os.path.join(os.path.dirname(__file__), 'data', 'test1.tar')
...@@ -42,24 +43,24 @@ def run(capsys, *args): ...@@ -42,24 +43,24 @@ def run(capsys, *args):
def progressbar_version(): def progressbar_version():
import progressbar import progressbar
return progressbar.__version__ return progressbar.__version__
@pytest.fixture @pytest.fixture
def progressbar_err(): def progressbar_err():
# This fixture returns an expected error message depending # This fixture returns an expected error message depending on progressbar
# on progressbar version, from the lowest to the highest. # version, from the lowest to the highest.
expected_err = { '3.19' : 'ETA', '3.34' : ''} expected_err = {'3.19': 'ETA', '3.34': ''}
actual_ver = progressbar_version() actual_ver = progressbar_version()
for k,v in expected_err.items(): for k, v in expected_err.items():
if vcls(actual_ver) < vcls(k): if LooseVersion(actual_ver) < LooseVersion(k):
return v return v
return '' return ''
@skip_unless_module_exists('progressbar') @skip_unless_module_exists('progressbar')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment