From 1c7a16850b6c7f4ebd85ce55ad8c61da98949078 Mon Sep 17 00:00:00 2001 From: Mauro Regli Date: Mon, 15 May 2023 09:12:53 +0200 Subject: [PATCH] Fix t09_repo:IncludeRepo3Test failing The output of the template parser seems to have changed with go 1.20 --- system/t09_repo/IncludeRepo3Test_gold | 2 +- system/t09_repo/include.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/system/t09_repo/IncludeRepo3Test_gold b/system/t09_repo/IncludeRepo3Test_gold index 96cda590c..d50438989 100644 --- a/system/t09_repo/IncludeRepo3Test_gold +++ b/system/t09_repo/IncludeRepo3Test_gold @@ -1 +1 @@ -ERROR: error parsing -repo template: template: repo:1: unexpected "}" in operand; missing space? +ERROR: error parsing -repo template: template: repo:1: bad character U+007D '}' diff --git a/system/t09_repo/include.py b/system/t09_repo/include.py index 0abe383ca..9a96da89d 100644 --- a/system/t09_repo/include.py +++ b/system/t09_repo/include.py @@ -1,8 +1,9 @@ -import tempfile -import shutil -import os import inspect +import os import re +import shutil +import tempfile + from lib import BaseTest @@ -68,9 +69,6 @@ class IncludeRepo3Test(BaseTest): runCmd = "aptly repo include -no-remove-files -keyring=${files}/aptly.pub -repo=my-{{.Distribution} ${changes}" expectedCode = 1 - def outputMatchPrepare(_, s): - return s.replace('; missing space?', '') - class IncludeRepo4Test(BaseTest): """