From patchwork Thu Apr 10 10:50:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4157 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-f192.google.com (mail-pg1-f192.google.com [209.85.215.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53AAoo1w011025 (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-f192.google.com with SMTP id 41be03b00d2f7-af54a9109f4sf384595a12.2 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=MqlpC5bURQfx/mKdmctEAYtOtFdO0n7LBpZaX41VOFdFoKP8Jkj74EjxioY1hsWlT+ UtGDMsKS5V9Z0A7n5C90PfQtkPSkyNNabwxIN+Nxvxo1ynaGxU6HOIzt7QVFC+QVmWCg +RD4wf0SsQvCZN5Y4zs0lD1e8jNZmel5Fttw90LxpFZqEB4tFtw7vrtGLN+qm1/pd+PO 8vYwct3yUa711Vn0EPWnt5B7PRSTUiAHC8eG+w5YCmUQhKgDv7+SO0PL235wBXBkn9Hu Lmc+0o3JtzUOXkCzRCsEEEc69f15Aus9Jjwzt4tDTo6no2gvFNzZlBLHpI4DQiGG48Rd BfKw== 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=+6pVGadispkmheDvMawVPv89l+ga11OsQKkUTyZPOI0=; b=jGAu3POswmtQ/DsctUR1TGoLUXatCQE1Lf5qS+pKj9TkJFEI7kreLreDNqm8jxzSKn sv0mKx8grRlamcHf1m8ky0z0QVI1IBLywKYX9KsBau3Dge//I7BBbRToqn1+jfxsxvBz mJAhMPNwEm788IAhDlGBhFzRa9KpCIrjfD846OXWt0T046yEbiXY6D1eXEbGCc/rfHPe +CIiM937kYw6ZAwojuo0n5K4yBpu4Gp50Qck9yIRNqhYUzrLj+pMjFFvCZMqDCZmygcW vbGIZRvHcTPzierkIOwENLaj5+unPVAak5kgRVqE9CGJyXD80cP752T2L0mR0O+MfjYj oU3g==; darn=isar-build.org 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=isar-build.org; 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=PkK8pvYogL4ZHbEiGD4L6GQ2Hvt1NlWAxxkIhgqu2F8cR79P0cFwAqjDDZV8f0Goa+ wiAQFYfc9uh9E48rHBr5eq5hdMg5btfg/msfTHhW9hZh2ZDR+g2/Ln7q15OdLu37Dq6P 9VA5Qn6CJmECdMWdEUK/mrupFJPGotymXGO1DwmxgPdaRH7CTPRTXxeBZlqlR+bvUxSx je7ISNnZVia0MRoNDYsOMN1056EoB8P1dUgXl83qU8+gi5QG9ilRZMUA9YNceIsKrtT7 pUdeLCvxckDtz5NFu1ulpJss8lrhraWHraD1CQT77+j73I0TbXUR6KaMpBoMWeRt9cDJ wbkQ== 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=WcSfGPD0nTX0cF0AGxuCuplb7pdSytCf3KDqpDY+52XDxQOYL+8cX1N1cJwtCcF+Dx Kqlt3FRiuieThhmQ7ij4PHw1gDKV7ZfPWb2vkQ2GQq1mTBz/rILrGw1YzJcn8QIiN7t8 brqYRZcFIluBMEQefHNWrEU1GNebO7D+Bzbc9k5dr5ZLDs4rBOk6EQ4WraxyFc4B//te Q0/lTOc9ClauJfYNBb5Tl2IjqXRyjdyYq9JdHNhxhD7wHBGaMc8zo87gS8QXNYb0lwNM qL8IBjZKPoqKyuMHLNYx/evbCqBe85nwTtC2paqr3rWN+Yp97H7c5sf5PnF25XtuATIw EZCA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCViFMm4hgq8aeADO4OcmhwDIFK0Q5q1Ucl5v6/ZVdg3uOUl3IwWDXyRlbfuaEhorYVdHr4mRFg=@isar-build.org X-Gm-Message-State: AOJu0YzlLx2NDz/ap4aHYKrfivvRhv6LFbsb+SVuyFB6bJu73xw04H0c 4QDslN88lJEn891jDRaB/my0yk60uJNTh4Cfsvoag85Z+AYTFTvb 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_H2, 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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):