From patchwork Tue Apr 13 07:02:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 411 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c543:0:0:0:0:0 with SMTP id j3csp2524119ooq; Tue, 13 Apr 2021 08:06:34 -0700 (PDT) X-Received: by 2002:a17:906:4b01:: with SMTP id y1mr17644986eju.218.1618326393926; Tue, 13 Apr 2021 08:06:33 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1618326393; cv=pass; d=google.com; s=arc-20160816; b=GlOb7chCpxgqvJMPSwCenJ9Quoix2gKBKNs2JumzigOQuoXQOjLkTEiLI/XjnbNDpC YfkDqSwdCWXxUvFZdQF1lgkunjDgp/MjfX4OntVCID020Ys6UDcGdUhVIxp2u4Avlo4O LoiQCOZHyMJKNja68YfeZ1g6YLhm7tb9W2FUOUvFmwvn2LGNUQFjQEEJG5YUpgOLG9FV numLExe+SLquZCV6s2fJ9ubSJFygTZkRtx3dc8J1NlPlTKeHVoP3OycCc5h2Cf4G7aKI DY7EHbVkBT7p8gSGSTxQnoXAXb1YzY69Te/MoiFRRa6i79DJrQtck1FEkAd+D3rxQCsC byLg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=avnUchHK9Avi6RC2hFuJsfc2XZwuSKUEA55hPMgC61cKmlREFHz2u32GEpg982q6ms VveniBDIVIQvLF1QkY4uQ5sfuQRKge5ezWQ0amsBcmnsBNzigE6pv3DnvM/UdLtBxb6j Aqsq+XMUWYiUhB999Ya5gXgXkQ/f3KC3IVRPImBA3ffvYi2arTQ3/B08C+bg01UfZu+C Z0cMowCGUG8fxOk6HBF2QDoiI7ijq2rKsYNSBIhTdUk55Oe3gSJLmgjS4gzjrbiLNlzY L7zNDCOUvSgLGbIUMg3dPvJzqLF05ufdKUbij8vpOZ3GT+UgAzQW90siBGWAJuQWsYhJ Sfrg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E2hGyLK3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRB6PG22BQMGQEJFXK24Y@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id g19sor7398429ejs.27.2021.04.13.08.06.33 (Google Transport Security); Tue, 13 Apr 2021 08:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E2hGyLK3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRB6PG22BQMGQEJFXK24Y@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1618326393; cv=pass; d=google.com; s=arc-20160816; b=sDCLEkpHoxoJBxyI9Q1ohrB4W+hwFReWSuJJCDVI/410N9Pq+/MzfbK2nJBw7VYSS/ TfJXQtyA8NgTNsduVgKp851tx5h8FQvIsPzwEVkZGdJ9mgZuH7CLdX2nXJlu0fhizbmS jRx16D/8rez8PmpC5Kjl1+h9tQz38CF4RbFFqzuCTUjiC+6lmVmpBjI3fT2BYLvFTpsB iS7+tGAQ/TyiMxP65gHGyxWWIPcXsAnoo5+6unoZrKDtyHQI2NunblzDYmCttGRKYV2X V48DFx0I8bGnzfCczvJ2/hXRg9tvJDxCkk22r6TtS8qPKx1p5auF+pitXGVdmoJ1YJzK Mtcg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=UF6yTbMCAjbqKeYJ6uVzBGlGY6u9PhFZjVapYXP1vi9efFw9dwdzjzPsH+sQlr288J WyUp4ge2VuHAgeGyH+L6MDIk/YJFK07J/1nDVJxzFofbrH8cES8xFnqB9HioZaDIAp4b hpB3DLIfK99bVrnLKAi7Or0iDExJKoj1oOoAA0Yrtlm1nbbDHnEu1WrTUqlAV0fb8tsm RxFd4hIIx29UcUoPFA3BrWKxN/gkUhSxLpkoj6LmUpki72WhXpC2BU8FPo6H3cyM2jCs HhRtzr9ZYspVDB3hGaHNcvZ125zFR+GkoDhozrKrynBTROd8WQPFtOyDhdQp1KrhVzQm bPjQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=E2hGyLK3ESOJQPMFLBOvy2Y+ri4PP9k0KCYwTLxPdWpfuggbvoMY/olxTDRu6QN7mQ jE6hl8hceQn5a7Jf2FJ2Ei2Wcp2aLvhW6ZjzfCO+sT+/byzdgq2MCgsN9bvN16FCVJro fax+GjERkUR4ZsvEoP5vm9EPhh7Xi/REq2e78Y0W9GPqLFUx5XOb+SUnLtTvXmBcJNXj Z3La591XSa0+OCJfRDHvCyTuRYt/Rtoz7FO1VxK9idHevVtISAw1TP3Wl0Gu8XslYtYs kaWhErWPUE9W15k3Jk8tPvRn1nhCuVccNJYyGA3bBfN+JIMWGq09E9i5BP3Q9+/PZ5CN TP9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=ODtjyFHA0TkMjg0gVn2iZ92PY0ZKSlHAESKUd2iqDfIMuKmiIUmD/IekKc0C4kbiNz h9jz3Qe9JtImraGJm+Bafkvr9bq8FgEcKN2232Z/c5YLEw7HK5nQxeXBt0I/DvWfsJj2 bt+nRemogCXW+Wnkbqb7qA4kBJmamf2k2MM+4LqenhEc/hnfz1P056yUwlzehed//92d jqhcwNmVGLgCufsrHTvOkOjovl2wEYd2RSJ+CKfG+/WoD0pWHb5yC0NlBUPzqwYgxvbu f0dPMYYWeg+mi059Z2P3PXCLkQ+g4ZWlueJ32qnKEjWAd6Kf5VAC8T1rMsdEZ80Swf+N pDSg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531DadO3QtFwYNMN4yWVh133EMRnJyXJFGYPd3iGlJBZqDN8yItA JmXOMaA/70u5vAc41tYgARA= X-Google-Smtp-Source: ABdhPJzVvEyuSMivSlt5TofG0EjLhvPaO2EtCor8TAyotv+HJYmFbwgqTkTywodw8QL1ov/QA/iA7g== X-Received: by 2002:a05:6402:1284:: with SMTP id w4mr34943485edv.181.1618326393644; Tue, 13 Apr 2021 08:06:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4c2:: with SMTP id n2ls3943122edw.2.gmail; Tue, 13 Apr 2021 08:06:32 -0700 (PDT) X-Received: by 2002:aa7:dc0b:: with SMTP id b11mr35889906edu.124.1618326392795; Tue, 13 Apr 2021 08:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618326392; cv=none; d=google.com; s=arc-20160816; b=GewKKKm/NLDpNiQxl8cVaXlZwuKPHWZ/1COhu/oKvvMkUoshb/6AIxHUX2trnPz1QH 7ER/y87DgaO+Tsfig2gTi0kF7OMMvdDKy7A6iPvPZ4eWORHnbuonaFNmSoF0I85xZrsV 7DI/Ul3wL80haY/uZbRMC13k2PGi784WCdRqqmE1EecNQVxyypu/SSsoN7YPbW11WDBr dXR6/IK6YDys7jRBNipBXcfjgrU773ZkPVp0FXa4nq8UvZ+g94mAlolkY1nx4kEtnnbE Zyrko8DuRXj5AjX0J2eW2EHHkC7XMiJTt85gCO83/az4ktT9OYz63hjDZ06MVPvYhPTx 9mTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=pISVF+c9b1J/nXrWAuW/NSbaUevBj1SThJbGe2I4i5c=; b=HoEY45vlCHN0JXXCajnvkQUaEHxZS3rkUGoywu7NyZz9Xbk6+bk3k5WZe1ba4qouZD dW7I8DH9cDbndVdL2czOPad7ZaxifmIUn78geQO0RNO6YGdnVlImwkUujl8EC+yeO1Ny 55lQUd/Vgl9BX1aKRBjPnIebYVF3W5E9csSiS2VJuSj6OCrAfe+p96WrptGaCkg0UNlP nlpxA2ACrc1F1iGu+fX3wKoO7zjyZc+PdUYa65AFvS1upBnubqVSfyXoC+wATUM3D4wo tXMCuPzRVepYm5rKaSiFfCPe+7GMZHx3ShDY8+LjOK7pUYeV9wwFFcFBLDl4H+kJ6mAR 9FXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id c12si1122887eds.0.2021.04.13.08.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Apr 2021 08:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 13DF6Wo5012254 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Apr 2021 17:06:32 +0200 Received: from localhost.localdomain ([167.87.48.83]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13DF2rM3021528; Tue, 13 Apr 2021 17:02:54 +0200 From: Henning Schild To: bitbake-devel@lists.openembedded.org Cc: isar-users@googlegroups.com, Richard Purdie , Cedric Hombourger , Chris Larson , Henning Schild Subject: [PATCH v2 2/3] tests/fetch: deduplicate local git testing code Date: Tue, 13 Apr 2021 17:02:50 +0200 Message-Id: <20210413150251.1969-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413150251.1969-1-henning.schild@siemens.com> References: <20210413150251.1969-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: INBOX X-GMAIL-THRID: =?utf-8?q?1696938217275815490?= X-GMAIL-MSGID: =?utf-8?q?1696938217275815490?= Purely cosmetic change that probably improves the code. Signed-off-by: Henning Schild --- lib/bb/tests/fetch.py | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index ddf6e97439b5..76797473db8a 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -673,7 +673,7 @@ class FetcherLocalTest(FetcherTest): with self.assertRaises(bb.fetch2.UnpackError): self.fetchUnpack(['file://a;subdir=/bin/sh']) - def test_local_gitfetch_usehead(self): + def dummyGitTest(self, suffix): # Create dummy local Git repo src_dir = tempfile.mkdtemp(dir=self.tempdir, prefix='gitfetch_localusehead_') @@ -690,7 +690,7 @@ class FetcherLocalTest(FetcherTest): # Fetch and check revision self.d.setVar("SRCREV", "AUTOINC") - url = "git://" + src_dir + ";protocol=file;usehead=1" + url = "git://" + src_dir + ";protocol=file;" + suffix fetcher = bb.fetch.Fetch([url], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @@ -699,31 +699,12 @@ class FetcherLocalTest(FetcherTest): unpack_rev = stdout[0].strip() self.assertEqual(orig_rev, unpack_rev) - def test_local_gitfetch_usehead_withname(self): - # Create dummy local Git repo - src_dir = tempfile.mkdtemp(dir=self.tempdir, - prefix='gitfetch_localusehead_') - src_dir = os.path.abspath(src_dir) - bb.process.run("git init", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit'", - cwd=src_dir) - # Use other branch than master - bb.process.run("git checkout -b my-devel", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit 2'", - cwd=src_dir) - stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir) - orig_rev = stdout[0].strip() - # Fetch and check revision - self.d.setVar("SRCREV", "AUTOINC") - url = "git://" + src_dir + ";protocol=file;usehead=1;name=newName" - fetcher = bb.fetch.Fetch([url], self.d) - fetcher.download() - fetcher.unpack(self.unpackdir) - stdout = bb.process.run("git rev-parse HEAD", - cwd=os.path.join(self.unpackdir, 'git')) - unpack_rev = stdout[0].strip() - self.assertEqual(orig_rev, unpack_rev) + def test_local_gitfetch_usehead(self): + self.dummyGitTest("usehead=1") + + def test_local_gitfetch_usehead_withname(self): + self.dummyGitTest("usehead=1;name=newName") class FetcherNoNetworkTest(FetcherTest): def setUp(self):