From patchwork Mon Mar 4 15:04:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3380 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 04 Mar 2024 16:04:14 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 424F4DuM030064 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 4 Mar 2024 16:04:14 +0100 Received: by mail-lj1-f188.google.com with SMTP id 38308e7fff4ca-2d2b9aa4e35sf27290871fa.3 for ; Mon, 04 Mar 2024 07:04:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709564648; cv=pass; d=google.com; s=arc-20160816; b=WKopjiE0+3+1f1YooYvi7QBp3KgevPbgJLCy6ueMes+SjIVixb2/TyfYX3XUd0dtgn gOm5s/al+WllxjQurk3PDj+C+CTsC+Ja+h97bq7Zm0TJ85Wrdh9SPTmaLC+bihKKNGbc T+Zw7itwtv8VuQct6NoJPGVFSHfDVRynMRIc5MWiA9jMFVz/vfwaoB1Tk8oR1dE+pti/ 1Cy8Y4C81wrOV/dcBmm6f7kmcOPTtEvq5ZyUYPliBg+bf8ii3DCQf7RKbBkr7fSrdMbN MX8V2gTa3L8TQkiLCQGEOLL7AUJDtj449p9hKpD6/tHnSahDJ6yPMRxh5xD3rCSVhJym 4bKw== 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:message-id:date :subject:to:from:sender:dkim-signature; bh=bwtyHmsYEDrAzs152viwmWEWbdrpNqK/gh3DAyzAjUA=; fh=v4+0wOEtsOf2fhL0mhCfaDZDdBCErMJZShPxJxmMpHA=; b=vJciAoHLXljfzum2n6aScTW2q4x9q1Iu1cRMLIaDiLXjoz1JnoT6sxHa0I6QrEJk39 TH9KNnpYTteik7MMK50Derz96bt0r05SY2CWmcvmn5gDhk+7/JXWQsGLE608f2w4g9jI FdEszVJUa0av7hE5ggx9bRY7racDTLQoeTPf64ybMMZCbakf0Ax/VjnynawSnuuoIRe7 BQjHKbFpU2xlzSwp+CQMQ0lABmc04wU1CwDQn07TYjsTMmnSiWCLOh9dRsRPopjVTdQN aiov73nyOvNY/sWTqO8rLBeLd8BZg7IG2nQQH7JJf9vhSfwZF5mVoHQLNs/SyWaphrnk eBKQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1709564648; x=1710169448; 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:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=bwtyHmsYEDrAzs152viwmWEWbdrpNqK/gh3DAyzAjUA=; b=esrssZhE8ytMOC9mWXFLbK7i4/JbmWIxt17CWn8YhwLX7SA/7NpQGY6JWenXyL6sbM Y43shnVjC9ehnEMkPGxu03ZiBF69/PFVrVlBdG4SkVVcCq/CD29Rs2BkwC13b1Mhjgib gjO4lVavywDx/LIzKHyiKKdJUKN1n+q1RYaUQULcZ1+OGk1Mf28Ygli1qlLXE+310Fv4 ayFeWAtCkfhdNaQee1VQ0r4quWQ0Nnhvrz8gYO0kgr1GFz9mNBBTYbIZ8MvQpId9Uh/0 y8SEd9oiukRs0oU+gtygw22hsoG5k57HggZ5dNNf/uqklw3j2BA7J4s7ZIC/o66Js8q/ dFGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709564648; x=1710169448; 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 :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=bwtyHmsYEDrAzs152viwmWEWbdrpNqK/gh3DAyzAjUA=; b=L3FmFcUM6hsSHphw5mn0QjV7BCWXaFw4hPVYr0qf+r18ZTBOcL4RjNNnGKArR+NOLy SuUiAR7g/KYzrcryKGt8pwDbBP3RYGZ0XX3j0HVNU/7cMD9s3QdeDiEJNctST60wDzxL L04E0pbrTV3v6/NGrWDBp0FiiHyZrOHJ0CyZY3NDSjJvQ0Mh76G0D1xVxqwZ0vtKlZr2 7625yRAdPoOVQmmU0MAsWgEbQmwwiAhys8Jo1daXHPMw+h1ULTfFjN28pR1m53arInYE xjlLQzSlacsoe7NydROVJF/kD3bQA/QjMP2EvXkWH0keqcJ2+M72+5M286QFDuUZHMzc zc9w== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX6LnA/EDKQigk7tC/ofvvwp+3lDJ41n6U2Gv16UYbWDQBbadO4vD6FZ8c7HTNt6FkCTPP7Vpx39W2nDutfJNXZX8SmOss= X-Gm-Message-State: AOJu0Yz8aNUjcSu5cKPTi12Zu9teFQoasE1OgvWZDKv7FyVQi86i/d8j btHh+qiEvwgs9+LNi9eN9yMQ0cKKkC4+Rx5DO6ZM2q11/Ac2VWja X-Google-Smtp-Source: AGHT+IHuvWFRaKH9mELMY2mtrsR7TOS80JW1ebVOVB7C6R38P/ogMQOxFOYugbt1j1PVNIqad2yxTA== X-Received: by 2002:a2e:b70e:0:b0:2d2:e61f:61a7 with SMTP id j14-20020a2eb70e000000b002d2e61f61a7mr6316704ljo.41.1709564647479; Mon, 04 Mar 2024 07:04:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d09:b0:412:d4c8:b850 with SMTP id l9-20020a05600c1d0900b00412d4c8b850ls750529wms.2.-pod-prod-06-eu; Mon, 04 Mar 2024 07:04:05 -0800 (PST) X-Received: by 2002:a05:600c:a019:b0:412:e290:3dd1 with SMTP id jg25-20020a05600ca01900b00412e2903dd1mr2322354wmb.9.1709564645319; Mon, 04 Mar 2024 07:04:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709564645; cv=none; d=google.com; s=arc-20160816; b=c8+WWcU95nL1w7Ova6VQ6nvsmqS28cCa9IC0HK+bKj7M4jleYtgK/ztOJXFnrkhQHu TVGTUKqeSivNp2gOcQlQ3wvC53Gc7zTdxZGB3hwb2Deo0+rTrZX0lywT+aVKZLWN/Zmj GQl6ymeziAsGnHaAQj87G8ZQOZRxeKaMLZmBRUSKaiCQoGXsNDkCVzw4Zra7IIC17mf+ jegLtNkrAoEf6OSma9a5ikEZcATXG+3NG/7dyS9gkScO3Gghtj8yGwkgnFLbBD+ZrW5b hIbNiOXtdnmy1rElIZ3R3ueynKe+cfmZLac31qd4uRFaQrcLjEOGR6PfXiHxQO8eweJp LI7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=g4zYjSxZGMLQxb/9zyy5NrmhwGFjgMPB6LqIDsTmGO0=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=objoWXrkcEXf97c+jbW4gAw36xed4PCNp1cb3FnKIl25zih5/J4wucDp19Alzwd04i CU/9tyalxIbVZV0MtBtnz63GzdXN7fQUSrXViEhS5baELtKBsQAe73TOxgvru/nmo9E9 MHhUT29hv7ycZcT740AxwpQd7z4iCwHLWsFNZy8QgZCn3evFgngiQh6EjHUByr7aJX8E XcppPrrOa9b/PgIRf/qAx1yADF2rFEy6FfisFEZ/TPIVPvWZKClf+g2Aw1u3D4dgqfTW joLfy158XDrtiLnPWTWdMxniaL9GgChFWr47BdGh/dGYcqAKNE6pX9Nqaq1bzAkSSaw3 ty0w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id c22-20020a05600c171600b00412df138480si133838wmn.1.2024.03.04.07.04.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Mar 2024 07:04:05 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 424F43db030050 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 4 Mar 2024 16:04:04 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] testsuite: Improve VM output check for login prompt Date: Mon, 4 Mar 2024 16:04:03 +0100 Message-Id: <20240304150403.13016-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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?= VM output is read by chunks and " login:" string is looked up in the every chunk. This may fail in case this string is splitted by two consecutive chunks. Improve this by looking up in a bigger data buffer instead of current chunk. Signed-off-by: Uladzimir Bely --- testsuite/cibuilder.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 002a368b..fa30c2f5 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -487,17 +487,20 @@ BBPATH .= ":${LAYERDIR}"\ poller.register(p1.stdout, select.POLLIN) poller.register(p1.stderr, select.POLLIN) + # Databuf of size enough to keep two data chunks + checked string + databuf = bytearray(b'') + databuf_size = 1024 * 2 + len(login_prompt) + while time.time() < timeout and p1.poll() is None: events = poller.poll(1000 * (timeout - time.time())) for fd, event in events: if event != select.POLLIN: continue if fd == p1.stdout.fileno(): - # Wait for the complete string if it is read in chunks - # like "i", "sar", " login:" - time.sleep(0.01) data = os.read(fd, 1024) - if login_prompt in data: + shift = max(0, len(data) + len(databuf) - databuf_size) + databuf = databuf[shift:] + bytearray(data) + if login_prompt in databuf: self.log.info('Got login prompt') return 0 if fd == p1.stderr.fileno():