From 7707844b7bd0259ebfd3c4c635ee323afd5384c6 Mon Sep 17 00:00:00 2001 From: Ildus Kurbangaliev Date: Mon, 25 Jun 2018 16:39:13 +0300 Subject: [PATCH 1/3] Add version property to PostgresNode: --- testgres/node.py | 10 ++++++++++ tests/test_simple.py | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/testgres/node.py b/testgres/node.py index 0b5e55cf..b171d965 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -278,6 +278,16 @@ def utils_log_file(self): def pg_log_file(self): return os.path.join(self.logs_dir, PG_LOG_FILE) + @property + def version(self): + """ + Return PostgreSQL version for this node. + + Returns: + Instance of :class:`distutils.version.LooseVersion`. + """ + return self._pg_version + def _try_shutdown(self, max_attempts): attempts = 0 diff --git a/tests/test_simple.py b/tests/test_simple.py index d395f25b..5689cdf0 100755 --- a/tests/test_simple.py +++ b/tests/test_simple.py @@ -857,6 +857,12 @@ def test_version_management(self): self.assertTrue(b > c) self.assertTrue(a > c) + version = get_pg_version() + with get_new_node() as node: + self.assertTrue(isinstance(version, str)) + self.assertTrue(isinstance(node.version, PgVer)) + self.assertTrue(node.version == version) + def test_child_pids(self): master_processes = [ ProcessType.AutovacuumLauncher, From 8b7d0d1abc4f3ff3fc92ff6be9cbaea202b91e90 Mon Sep 17 00:00:00 2001 From: Ildus Kurbangaliev Date: Mon, 25 Jun 2018 18:27:59 +0300 Subject: [PATCH 2/3] Fix tests for python 2 --- tests/test_simple.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_simple.py b/tests/test_simple.py index 5689cdf0..343eedd0 100755 --- a/tests/test_simple.py +++ b/tests/test_simple.py @@ -7,6 +7,7 @@ import tempfile import testgres import time +import six import unittest import logging.config @@ -859,7 +860,7 @@ def test_version_management(self): version = get_pg_version() with get_new_node() as node: - self.assertTrue(isinstance(version, str)) + self.assertTrue(isinstance(version, six.string_types)) self.assertTrue(isinstance(node.version, PgVer)) self.assertTrue(node.version == version) From 95b5c5debebe8864574d298addd671a1e03d588e Mon Sep 17 00:00:00 2001 From: Ildus Kurbangaliev Date: Tue, 26 Jun 2018 14:37:47 +0300 Subject: [PATCH 3/3] Fix tests for python 2 --- tests/test_simple.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_simple.py b/tests/test_simple.py index 343eedd0..2e557309 100755 --- a/tests/test_simple.py +++ b/tests/test_simple.py @@ -862,7 +862,7 @@ def test_version_management(self): with get_new_node() as node: self.assertTrue(isinstance(version, six.string_types)) self.assertTrue(isinstance(node.version, PgVer)) - self.assertTrue(node.version == version) + self.assertEqual(node.version, str(version)) def test_child_pids(self): master_processes = [ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy