From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 10 Apr 2025 12:50:52 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f185.google.com (mail-pg1-f185.google.com [209.85.215.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53AAoomB011027 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 12:50:51 +0200 Received: by mail-pg1-f185.google.com with SMTP id 41be03b00d2f7-af5a8c67707sf499561a12.1 for ; Thu, 10 Apr 2025 03:50:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744282243; cv=pass; d=google.com; s=arc-20240605; b=kDxs/uqv6h6t0g8Q1nc+iId2AAkAANe+unztJS2o/J3k5jjfj9dGpYNprDaRLbn1Ei UFFPlmUXmw0xSdGMyXXuVCbyFRDyD73ceTCLLRDGl9n8CvcprdifP0vOdICjkBSvEMER GJjwUerya4HwGTFl3vaEw/Q9hDABfB9bAu/Iyj+VQDAOHOUDIKsr+BgEGPggxQTVjI/X dXw0M5M/pM+Gieu9NyuvQ6m+oIWLVPP7eeztuxVkAWROl3cjcz+CBxrk1cSpALUHYIoj 9BnshATBtF4cQTvL1bqglT5fwy3rRxkpVQIBRWOteQYbw7QBZN0LI8lVgCG4f4eQ4ugB 87lQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=XYsM4I/wKXBW9uweE80gQbSM7Lj3619YBr+Ma6Z9yck=; fh=Dko3M6E1Of76wn86WLZqDXgBbTH9TM5KqNjbJKP3SOM=; b=cYpOMl9tsLASfo6GTv2ZgVBlJDQLFm8wWKPIcaK9sx8CWiYC/Z1E+5KSjsu344NBVu jSOwGY+eA/yN+IyZfp94vzi2kExuhmOO1+F1GYvoohuk2EFpEjnwMwSILh2OP3wEESNV Eu8p/iAfpSQgl2jiLGmEWKWhsFZdKVujN7QLAGTRBEpPr4xsvqP4nkfM4PXl+ZomoB6C d/2A+ZMpr66UMd7aWf/RHwSmZZYNs/8sEiSX6E5/ilGXLlm0FD5MWn0AbwYq8CEvOCYy U9zhh8n85w4VuqoMClOIoIGu32F/AQ+t9gdJAA/sDI5dPZ+v2S3iJdScmNkeLl0gNkL4 xl+A==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1744282243; x=1744887043; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=XYsM4I/wKXBW9uweE80gQbSM7Lj3619YBr+Ma6Z9yck=; b=nGx8F4tKGHwS+Xm2tKJwiZI+3ugbLDr5GgFMLq9XJWHRQ+4ikAQzdvPZg5lyYibR1/ 0wCQD2TWV+NeUDnjQdnNyZCJifJcn6xxbdE3IxXRKTxOMeMdz44tQSoqsZKukh4IKfBy WYIHWUB9YK4LUefpMVKMNkw8kMSB5A2zxP0+p6sR6L6t8BFjJ5kBJPbL6t1yMtQNH37O 5lVwHpnCUSnxn47dq6Xobm9EPY+oqUBVITIdcMxbiFRULYqPn6V/xyQ21iz4g/HiVtfD HvdgNOEHfzyEUhx/GFqikbBnhOUPyOfIk5CnXMF8PVBalQR8Je+IB8ZkcHSSl8FXkpg3 lyUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744282243; x=1744887043; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=XYsM4I/wKXBW9uweE80gQbSM7Lj3619YBr+Ma6Z9yck=; b=c6/F36HvPjLhuEv1HSZ/9ryo66QkwheAIckii3zjRXapHm27t3VcXEvs2IchisN4cD 3FknwmH64mwp0b3fS7jOXm0eo7EXKtV2RHh53798FZ1wNUIo9ImMQuExrzTXX94qmYrQ SsOyD9g3pFp5uNZvH+7GJ5sGlcYFj9/4TWKZBkxJ8QeDORydaETb9+gK77l/YItEvJ1T e3GUXpucVX/Xhx4vQopGGdvo/KFzHFIeC5kq9h2WIP2YdBxr7Ebp9I9Ka8ta3NeiFW2c F0vA1iQc9SxcHlzNYPKdZxSomM01r1Gykgzy0JG+7HVVOZe/PecnxQ+efv5jKFMZHRpv DtKA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV5m3XJhImMdVbP268wsivYc977tLAniw/lZozmdoe/ibVGWcFefzBBgnnyeNN3BZBoS3l8@ilbers.de X-Gm-Message-State: AOJu0Yyfl9Rnndndhhxd7j44O7KlXeVs1X5rA59xeQTctOLS4TZTBOvE 6Dxcu+xpPYhld0czOK43uuHq/1e6uUwwu8ihScN6tCVJR5JwKXpN X-Google-Smtp-Source: AGHT+IGGVU5lsC1EYylNdpsGalIzdphhYHNUZwUkPoFnpsk8oshlnZ8a7yfjarlb4702YO7mnmKa1Q== X-Received: by 2002:a17:902:e54b:b0:220:fb23:48df with SMTP id d9443c01a7336-22be0388df4mr23448815ad.36.1744282242947; Thu, 10 Apr 2025 03:50:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJvJEYMa8+EjQp2LWk+Gvb3InfQgNZF3XPaCmW9rH21pA== Received: by 2002:a17:902:fa44:b0:229:4280:7a09 with SMTP id d9443c01a7336-22acf260f52ls1721475ad.2.-pod-prod-09-us; Thu, 10 Apr 2025 03:50:42 -0700 (PDT) X-Received: by 2002:a17:903:3e0e:b0:220:faa2:c917 with SMTP id d9443c01a7336-22be0388bc0mr20719935ad.34.1744282241716; Thu, 10 Apr 2025 03:50:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744282241; cv=none; d=google.com; s=arc-20240605; b=YM4FbntYD4wumgeB/u6leRGfwI5LfsG4BUr7PVa1daIieuU5uX9Ij7hXKy5eTIiHpD LlrRsa7c9k3nRGwIF5K6acVRSBpjSIEs1CGaTFNCkZIi+XbtW6cerdk64eIAqdfauUbX LSCIISaeZcuakDBdlIEQwNh1oRI08tWnIv+rAg6y5/iJEdeKhVUKyJxM14i58pgfWlv/ 81qzte4duq9ql7wtH+r2Xs/uA7+29bgQKe75PCxeALVIhs36uw4s41rvLZuGIHSk3u+h n625J7+cMqby3ridA6IdQcYh/eKwXEzihu/6413XQtsTol0nzWWOi3Qqmf/EF5HpVJ4V DnZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=+B0WQ3OFnN3mI4VJ3+/v0PBNAGxaliyMb3eSg99BgI0=; fh=CwCU2rLWw4EY7I15ptLF0XIts//b60mXNlmtLyUV/9o=; b=BiR6L7JyPuhRsMe59vLA8Us6q5rEbmiTJLPz5XKlhAEzhwwydjt8rbCpbcgRcvoGZy YNBIuV4hYIXeH09I9gryK8scb3sfU9+k4yp8EvMAa2KljpQ351kHy3O3wXoI76B7RuSj SIdQGvW3nxVC2Vci9AlKLVxGB4TX4O/n0IcHbVY35c9eFOvA7I+mkUrb7U+z+xMQP/I/ /5D8e96Rkazc9gNzc7Z+E0+ORYH7+Tv1RmcYnybFcUtzKmo4joDnttC0hHvgYzDUctAw 7fcqaZNphMJajhcDXPVNS7co5qnaVYyMYNF6AEwwaG9ulXSF9aJg7xtuD56rrUHLqJ67 wymA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-22ac75d5fffsi844635ad.0.2025.04.10.03.50.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 03:50:41 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain ([77.38.240.154]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 53AAoZpK010901 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Apr 2025 12:50:39 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Maria Selvam Subject: [PATCH 8/8] CI: Resolve sourceTest failure Date: Thu, 10 Apr 2025 13:50:25 +0300 Message-Id: <20250410105025.47019-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410105025.47019-1-amikan@ilbers.de> References: <20250410105025.47019-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-TUID: ArWS3gsAm+W/ From: Maria Selvam On "3.0 native" format deb package, by default the VCS related files are removed. There is NO need to add DPKG_SOURCE_EXTRA_ARGS parameter explicitly. Signed-off-by: Maria Selvam --- testsuite/cibase.py | 14 +++++++++++++- testsuite/citest.py | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 075535b1..6ffedcea 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -5,6 +5,7 @@ import os import re import shutil import tempfile +import tarfile from cibuilder import CIBuilder, isar_root from utils import CIUtils @@ -305,6 +306,16 @@ class CIBaseTest(CIBuilder): self.fail("Failed rebuild package and image") def perform_source_test(self, targets, **kwargs): + def is_deb_quilt_package(tar_path): + with tarfile.open(tar_path) as tar: + is_quilt_package = True + for member in tar.getnames(): + if '/debian/source/format' in member: + file_data = tar.extractfile(member).read() + if b'3.0 (native)' in file_data: + is_quilt_package = False + return is_quilt_package + def get_source_content(targets): sfiles = dict() for target in targets: @@ -316,7 +327,8 @@ class CIBaseTest(CIBuilder): if len(targz) < 1: self.fail("No source packages found") for fname in targz: - sfiles[target][fname] = CIUtils.get_tar_content(fname) + if is_deb_quilt_package(fname): + sfiles[target][fname] = CIUtils.get_tar_content(fname) return sfiles self.configure(**kwargs) diff --git a/testsuite/citest.py b/testsuite/citest.py index e2ce45d1..56ac1f52 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -473,7 +473,7 @@ class SourceTest(CIBaseTest): """ Source contents test - :avocado: tags=source + :avocado: tags=source,full """ def test_source(self): -- 2.34.1 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250410105025.47019-9-amikan%40ilbers.de.