From e8b2c6d3f513174147e4cb10cc6eb71f7723396c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Hagberg?= Date: Wed, 11 Dec 2024 16:40:47 +0100 Subject: [PATCH 1/2] Changes to testsuite-result.json of unknown origin --- ci/testsuite-result.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/testsuite-result.json b/ci/testsuite-result.json index 23f4074f..a58b14ea 100644 --- a/ci/testsuite-result.json +++ b/ci/testsuite-result.json @@ -95,7 +95,7 @@ "ttl": null } ], - "updated": false, + "updated": true, "primary_ns": "ns1.example.org", "email": "hostmaster@example.org", "refresh": 10800, @@ -143,7 +143,7 @@ "ttl": null } ], - "updated": false, + "updated": true, "primary_ns": "ns1.example.org", "email": "hostmaster@example.org", "refresh": 10800, @@ -187,7 +187,7 @@ "ttl": null } ], - "updated": false, + "updated": true, "primary_ns": "ns1.example.org", "email": "hostmaster@example.org", "refresh": 10800, @@ -227,7 +227,7 @@ "ttl": null } ], - "updated": false, + "updated": true, "primary_ns": "ns1.example.org", "email": "hostmaster@example.org", "refresh": 10800, @@ -283,7 +283,7 @@ "ttl": null } ], - "updated": false, + "updated": true, "primary_ns": "ns1.example.org", "email": "hostmaster@example.org", "refresh": 10800, @@ -14633,10 +14633,10 @@ ], "owners": [ { - "name": "anotherowner" + "name": "myself" }, { - "name": "myself" + "name": "anotherowner" } ], "name": "mygroup", From d24171f414923b5b7e3c92444912ecc7b04278f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Hagberg?= Date: Wed, 11 Dec 2024 16:49:09 +0100 Subject: [PATCH 2/2] Keep created/updated fields in testsuite results Now that diff.py is able to ignore changes in date/timestamps, let's add back created and updated fields in the test result. --- ci/diff.py | 2 +- ci/testsuite-result.json | 2330 +++++++++++++++++++++++++++++++++++-- mreg_cli/outputmanager.py | 3 - 3 files changed, 2256 insertions(+), 79 deletions(-) diff --git a/ci/diff.py b/ci/diff.py index ade0bff3..d9075058 100644 --- a/ci/diff.py +++ b/ci/diff.py @@ -126,7 +126,7 @@ def preprocess_json(s: str) -> str: # Replace all non-deterministic values with placeholders s = timestamp_pattern.sub("