Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Support special version
  • Loading branch information
v.shepard committed Jul 20, 2023
commit c13b106b5dbfe5103e654f5b1f321ecde3d56146
12 changes: 10 additions & 2 deletions testgres/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
import tempfile

from contextlib import contextmanager
from packaging.version import Version
from packaging.version import Version, InvalidVersion
import re
try:
from shutil import which as find_executable
except ImportError:
Expand All @@ -27,8 +28,15 @@
# ports used by nodes
bound_ports = set()


# re-export version type
PgVer = Version
class PgVer(Version):
def __init__(self, version: str) -> None:
try:
super().__init__(version)
except InvalidVersion:
version = re.sub(r"[a-zA-Z].*", "", version)
super().__init__(version)


def reserve_port():
Expand Down
8 changes: 8 additions & 0 deletions tests/test_simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -901,13 +901,21 @@ def test_version_management(self):
d = PgVer('15.0')
e = PgVer('15rc1')
f = PgVer('15beta4')
h = PgVer('15.3biha')
i = PgVer('15.3')
g = PgVer('15.3.1bihabeta1')
k = PgVer('15.3.1')

self.assertTrue(a == b)
self.assertTrue(b > c)
self.assertTrue(a > c)
self.assertTrue(d > e)
self.assertTrue(e > f)
self.assertTrue(d > f)
self.assertTrue(h > f)
self.assertTrue(h == i)
self.assertTrue(g == k)
self.assertTrue(g > h)

version = get_pg_version()
with get_new_node() as node:
Expand Down