Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96540/?format=api
{ "id": 96540, "url": "http://patchwork.dpdk.org/api/patches/96540/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/patch/1627941124-172249-1-git-send-email-lijuan.tu@intel.com/", "project": { "id": 3, "url": "http://patchwork.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<1627941124-172249-1-git-send-email-lijuan.tu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/1627941124-172249-1-git-send-email-lijuan.tu@intel.com", "date": "2021-08-02T21:52:04", "name": "framework: fix session output", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6640020d08efcc3f95ea3203985b1d67e467f5fb", "submitter": { "id": 1098, "url": "http://patchwork.dpdk.org/api/people/1098/?format=api", "name": "Tu, Lijuan", "email": "lijuan.tu@intel.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dts/patch/1627941124-172249-1-git-send-email-lijuan.tu@intel.com/mbox/", "series": [ { "id": 18139, "url": "http://patchwork.dpdk.org/api/series/18139/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/list/?series=18139", "date": "2021-08-02T21:52:04", "name": "framework: fix session output", "version": 1, "mbox": "http://patchwork.dpdk.org/series/18139/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96540/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/96540/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BF5DAA0C41;\n\tMon, 2 Aug 2021 16:03:02 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AC8EA41147;\n\tMon, 2 Aug 2021 16:03:02 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id EAFF040140\n for <dts@dpdk.org>; Mon, 2 Aug 2021 16:03:00 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Aug 2021 07:02:23 -0700", "from unknown (HELO dpdk-lijuan.sh.intel.com) ([10.67.119.192])\n by FMSMGA003.fm.intel.com with ESMTP; 02 Aug 2021 07:02:19 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10063\"; a=\"200632032\"", "E=Sophos;i=\"5.84,289,1620716400\"; d=\"scan'208\";a=\"200632032\"", "E=Sophos;i=\"5.84,289,1620716400\"; d=\"scan'208\";a=\"510169004\"" ], "X-ExtLoop1": "1", "From": "Lijuan Tu <lijuan.tu@intel.com>", "To": "reshma.pattan@intel.com", "Cc": "dts@dpdk.org,\n\tLijuan Tu <lijuan.tu@intel.com>", "Date": "Tue, 3 Aug 2021 05:52:04 +0800", "Message-Id": "<1627941124-172249-1-git-send-email-lijuan.tu@intel.com>", "X-Mailer": "git-send-email 1.8.3.1", "Subject": "[dts] [PATCH] framework: fix session output", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "* it should flush buffer before getting output\n* fix strip space in all session output\n* fix some output don't have \\r\\n before [PEXPECT]\n\nSigned-off-by: Lijuan Tu <lijuan.tu@intel.com>\nReported-by: Reshma Pattan <reshma.pattan@intel.com>\n---\n framework/crb.py | 7 ++++---\n framework/ssh_pexpect.py | 15 +++++++--------\n 2 files changed, 11 insertions(+), 11 deletions(-)", "diff": "diff --git a/framework/crb.py b/framework/crb.py\nindex 3964e21..e029e71 100644\n--- a/framework/crb.py\n+++ b/framework/crb.py\n@@ -94,10 +94,11 @@ class Crb(object):\n \n # sometimes there will be no alt_session like VM dut\n if alt_session and self.alt_session:\n- return self.alt_session.session.send_expect(cmds, expected,\n+ out = self.alt_session.session.send_expect(cmds, expected,\n timeout, verify)\n-\n- return self.session.send_expect(cmds, expected, timeout, verify)\n+ else:\n+ out = self.session.send_expect(cmds, expected, timeout, verify)\n+ return out.strip()\n \n def create_session(self, name=\"\"):\n \"\"\"\ndiff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py\nindex fbc7dd4..6fcaa20 100644\n--- a/framework/ssh_pexpect.py\n+++ b/framework/ssh_pexpect.py\n@@ -78,6 +78,8 @@ class SSHPexpect:\n self.clean_session()\n self.session.PROMPT = expected\n self.__sendline(command)\n+ # flush buffer before prompt, else buffer may impact output\n+ self.__flush()\n self.__prompt(command, timeout)\n aware_keyintr()\n \n@@ -127,13 +129,13 @@ class SSHPexpect:\n ignore_keyintr()\n self.session.PROMPT = self.magic_prompt\n try:\n+ self.__flush()\n self.session.prompt(timeout)\n except Exception as e:\n- pass\n+ raise(e)\n \n aware_keyintr()\n before = self.get_output_all()\n- self.__flush()\n \n return before\n \n@@ -159,15 +161,12 @@ class SSHPexpect:\n def get_output_before(self):\n if not self.isalive():\n raise SSHSessionDeadException(self.host)\n- before = self.session.before.rsplit('\\r\\n', 1)\n- if before[0] == \"[PEXPECT]\":\n- before[0] = \"\"\n \n- return before[0]\n+ before = self.session.before.strip('[PEXPECT]')\n+ return before\n \n def get_output_all(self):\n- output = self.session.before\n- output.replace(\"[PEXPECT]\", \"\")\n+ output = self.session.before.strip('[PEXPECT]')\n return output\n \n def close(self, force=False):\n", "prefixes": [] }