Bug#1018080: buster-pu: package python-keystoneauth1/3.10.0-2+deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Debian OpenStack <team+openstack@tracker.debian.org>
* Add upstream fix to make tests pass in 2020. (Closes: #950041)
Test-only changes to fix FTBFS.
diff -Nru python-keystoneauth1-3.10.0/debian/changelog python-keystoneauth1-3.10.0/debian/changelog
--- python-keystoneauth1-3.10.0/debian/changelog 2018-09-04 16:39:50.000000000 +0300
+++ python-keystoneauth1-3.10.0/debian/changelog 2022-08-25 16:07:29.000000000 +0300
@@ -1,3 +1,10 @@
+python-keystoneauth1 (3.10.0-2+deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix to make tests pass in 2020. (Closes: #950041)
+
+ -- Adrian Bunk <bunk@debian.org> Thu, 25 Aug 2022 16:07:29 +0300
+
python-keystoneauth1 (3.10.0-2) unstable; urgency=medium
* Uploading to unstable.
diff -Nru python-keystoneauth1-3.10.0/debian/patches/Make_tests_pass_in_2020.patch python-keystoneauth1-3.10.0/debian/patches/Make_tests_pass_in_2020.patch
--- python-keystoneauth1-3.10.0/debian/patches/Make_tests_pass_in_2020.patch 1970-01-01 02:00:00.000000000 +0200
+++ python-keystoneauth1-3.10.0/debian/patches/Make_tests_pass_in_2020.patch 2022-08-25 16:07:10.000000000 +0300
@@ -0,0 +1,72 @@
+Description: Make tests pass in 2020
+ This issue was found while working on reproducible builds for openSUSE.
+ .
+ This solves it similar to change I73bde68be53afff4e8dff12d756b8381f34b2adb
+ .
+ Changed month to February to avoid races around new year.
+Author: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
+Date: Mon, 9 Sep 2019 21:00:14 +0200
+Change-Id: I2a28f3f4eaabaa772df395f3f5d55b6fd78f8968
+Origin: upstream, https://review.opendev.org/701419
+Last-Update: 2020-02-10
+
+diff --git a/keystoneauth1/tests/unit/identity/test_identity_v2.py b/keystoneauth1/tests/unit/identity/test_identity_v2.py
+index 530b0468..d7b76b82 100644
+--- a/keystoneauth1/tests/unit/identity/test_identity_v2.py
++++ b/keystoneauth1/tests/unit/identity/test_identity_v2.py
+@@ -12,6 +12,7 @@
+
+ import copy
+ import json
++import time
+ import uuid
+
+ from keystoneauth1 import _utils as ksa_utils
+@@ -84,7 +85,8 @@ def setUp(self):
+ self.TEST_RESPONSE_DICT = {
+ "access": {
+ "token": {
+- "expires": "2020-01-01T00:00:10.000123Z",
++ "expires": "%i-02-01T00:00:10.000123Z" %
++ (1 + time.gmtime().tm_year),
+ "id": self.TEST_TOKEN,
+ "tenant": {
+ "id": self.TEST_TENANT_ID
+diff --git a/keystoneauth1/tests/unit/identity/test_identity_v3.py b/keystoneauth1/tests/unit/identity/test_identity_v3.py
+index e257e8f3..d928d4d0 100644
+--- a/keystoneauth1/tests/unit/identity/test_identity_v3.py
++++ b/keystoneauth1/tests/unit/identity/test_identity_v3.py
+@@ -12,6 +12,7 @@
+
+ import copy
+ import json
++import time
+ import uuid
+
+ from keystoneauth1 import _utils as ksa_utils
+@@ -135,6 +136,7 @@ def setUp(self):
+ self.TEST_DISCOVERY_RESPONSE = {
+ 'versions': {'values': [fixture.V3Discovery(self.TEST_URL)]}}
+
++ nextyear = 1 + time.gmtime().tm_year
+ self.TEST_RESPONSE_DICT = {
+ "token": {
+ "methods": [
+@@ -142,7 +144,7 @@ def setUp(self):
+ "password"
+ ],
+
+- "expires_at": "2020-01-01T00:00:10.000123Z",
++ "expires_at": "%i-02-01T00:00:10.000123Z" % nextyear,
+ "project": {
+ "domain": {
+ "id": self.TEST_DOMAIN_ID,
+@@ -195,7 +197,7 @@ def setUp(self):
+ "application_credential"
+ ],
+
+- "expires_at": "2020-01-01T00:00:10.000123Z",
++ "expires_at": "%i-02-01T00:00:10.000123Z" % nextyear,
+ "project": {
+ "domain": {
+ "id": self.TEST_DOMAIN_ID,
diff -Nru python-keystoneauth1-3.10.0/debian/patches/series python-keystoneauth1-3.10.0/debian/patches/series
--- python-keystoneauth1-3.10.0/debian/patches/series 2018-09-04 16:39:50.000000000 +0300
+++ python-keystoneauth1-3.10.0/debian/patches/series 2022-08-25 16:07:18.000000000 +0300
@@ -1 +1,2 @@
no-intersphinx-in-doc.patch
+Make_tests_pass_in_2020.patch
Reply to: