53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
From 3b9aa7cf9f3b000407dc0ee8e77fbcf54fa04d7f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karolina Surma <ksurma@redhat.com>
|
||
|
|
Date: Wed, 24 Apr 2024 09:56:08 +0200
|
||
|
|
Subject: [PATCH] Fix tests with Python 3.13
|
||
|
|
|
||
|
|
The textual representation of addresses has changed, adapt the code to
|
||
|
|
expect different values on Python 3.13+.
|
||
|
|
See: https://github.com/python/cpython/commit/f22bf8e3cf899896cf587099d292
|
||
|
|
---
|
||
|
|
tests/test_ipaddress.py | 15 +++++++++++++--
|
||
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/test_ipaddress.py b/tests/test_ipaddress.py
|
||
|
|
index 4a2339ef9..3f8036900 100755
|
||
|
|
--- a/tests/test_ipaddress.py
|
||
|
|
+++ b/tests/test_ipaddress.py
|
||
|
|
@@ -18,6 +18,7 @@
|
||
|
|
|
||
|
|
from . import testutils
|
||
|
|
import unittest
|
||
|
|
+import sys
|
||
|
|
|
||
|
|
import psycopg2
|
||
|
|
import psycopg2.extras
|
||
|
|
@@ -68,7 +69,12 @@ def test_inet_adapt(self):
|
||
|
|
self.assertEquals(cur.fetchone()[0], '127.0.0.1/24')
|
||
|
|
|
||
|
|
cur.execute("select %s", [ip.ip_interface('::ffff:102:300/128')])
|
||
|
|
- self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||
|
|
+
|
||
|
|
+ # The texual representation of addresses has changed in Python 3.13
|
||
|
|
+ if sys.version_info >= (3, 13):
|
||
|
|
+ self.assertEquals(cur.fetchone()[0], '::ffff:1.2.3.0/128')
|
||
|
|
+ else:
|
||
|
|
+ self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||
|
|
|
||
|
|
@testutils.skip_if_crdb("cidr")
|
||
|
|
def test_cidr_cast(self):
|
||
|
|
@@ -109,7 +115,12 @@ def test_cidr_adapt(self):
|
||
|
|
self.assertEquals(cur.fetchone()[0], '127.0.0.0/24')
|
||
|
|
|
||
|
|
cur.execute("select %s", [ip.ip_network('::ffff:102:300/128')])
|
||
|
|
- self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||
|
|
+
|
||
|
|
+ # The texual representation of addresses has changed in Python 3.13
|
||
|
|
+ if sys.version_info >= (3, 13):
|
||
|
|
+ self.assertEquals(cur.fetchone()[0], '::ffff:1.2.3.0/128')
|
||
|
|
+ else:
|
||
|
|
+ self.assertEquals(cur.fetchone()[0], '::ffff:102:300/128')
|
||
|
|
|
||
|
|
|
||
|
|
def test_suite():
|