Merging upstream version 1.14.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
455e66126a
commit
cd1500a24a
19 changed files with 152 additions and 114 deletions
|
@ -1,6 +1,8 @@
|
|||
from textwrap import dedent
|
||||
|
||||
from packaging.version import parse as version_parse # noqa: F401
|
||||
import pexpect
|
||||
import pytest
|
||||
from textwrap import dedent
|
||||
|
||||
|
||||
def test_start_on_connection_error():
|
||||
|
@ -29,14 +31,14 @@ def test_short_help_option(config):
|
|||
c.close()
|
||||
|
||||
|
||||
@pytest.mark.skipif("int(os.environ['REDIS_VERSION']) != 5")
|
||||
@pytest.mark.skipif("version_parse(os.environ['REDIS_VERSION']) != version_parse('5')")
|
||||
def test_server_version_in_starting_on5():
|
||||
c = pexpect.spawn("iredis", timeout=2)
|
||||
c.expect("redis-server 5")
|
||||
c.close()
|
||||
|
||||
|
||||
@pytest.mark.skipif("int(os.environ['REDIS_VERSION']) != 6")
|
||||
@pytest.mark.skipif("version_parse(os.environ['REDIS_VERSION']) != version_parse('6')")
|
||||
def test_server_version_in_starting_on6():
|
||||
c = pexpect.spawn("iredis", timeout=2)
|
||||
c.expect("redis-server 6")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue