Revert "Strip prompt by default in send_expect"
Commit Message
This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
As it casued some cases failed:
* flow_classify_softnic
* test_ipv4_acl_jump
* test_ipv4_acl_table
* test_ipv6_hash_jump
* unit_tests_loopback
* test_link_mode
* test_loopback_mode
* distributor
* maximum_workers
---
framework/crb.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Comments
> -----Original Message-----
> From: Tu, Lijuan <lijuan.tu@intel.com>
> Sent: 2021年5月13日 0:12
> To: ohilyard@iol.unh.edu; dliu@iol.unh.edu
> Cc: dts@dpdk.org; Tu, Lijuan <lijuan.tu@intel.com>
> Subject: [PATCH] Revert "Strip prompt by default in send_expect"
>
> This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
> As it casued some cases failed:
> * flow_classify_softnic
> * test_ipv4_acl_jump
> * test_ipv4_acl_table
> * test_ipv6_hash_jump
> * unit_tests_loopback
> * test_link_mode
> * test_loopback_mode
> * distributor
> * maximum_workers
> ---
Applied
On Wed, May 12, 2021 at 10:14 AM Lijuan Tu <lijuan.tu@intel.com> wrote:
>
> This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
> As it casued some cases failed:
> * flow_classify_softnic
> * test_ipv4_acl_jump
> * test_ipv4_acl_table
> * test_ipv6_hash_jump
> * unit_tests_loopback
> * test_link_mode
> * test_loopback_mode
> * distributor
> * maximum_workers
Any update on having both worlds (UNH lab and those tests) coexist?
I see an exhaustive list of tests that are broken with the new behavior.
Another approach to reverting the whole change is to pass
trim_whitespace= in the affected tests.
Was this idea considered?
Passing trim_whitespace=True was my solution to issues like this when I
created the patch.
On Wed, May 26, 2021 at 8:23 AM David Marchand <david.marchand@redhat.com>
wrote:
> On Wed, May 12, 2021 at 10:14 AM Lijuan Tu <lijuan.tu@intel.com> wrote:
> >
> > This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
> > As it casued some cases failed:
> > * flow_classify_softnic
> > * test_ipv4_acl_jump
> > * test_ipv4_acl_table
> > * test_ipv6_hash_jump
> > * unit_tests_loopback
> > * test_link_mode
> > * test_loopback_mode
> > * distributor
> > * maximum_workers
>
> Any update on having both worlds (UNH lab and those tests) coexist?
>
> I see an exhaustive list of tests that are broken with the new behavior.
> Another approach to reverting the whole change is to pass
> trim_whitespace= in the affected tests.
> Was this idea considered?
>
>
> --
> David Marchand
>
>
On Wed, May 26, 2021 at 2:23 PM David Marchand
<david.marchand@redhat.com> wrote:
>
> On Wed, May 12, 2021 at 10:14 AM Lijuan Tu <lijuan.tu@intel.com> wrote:
> >
> > This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
> > As it casued some cases failed:
> > * flow_classify_softnic
> > * test_ipv4_acl_jump
> > * test_ipv4_acl_table
> > * test_ipv6_hash_jump
> > * unit_tests_loopback
> > * test_link_mode
> > * test_loopback_mode
> > * distributor
> > * maximum_workers
>
> Any update on having both worlds (UNH lab and those tests) coexist?
>
> I see an exhaustive list of tests that are broken with the new behavior.
> Another approach to reverting the whole change is to pass
> trim_whitespace= in the affected tests.
> Was this idea considered?
Ping.
> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: 2021年6月2日 15:36
> To: Tu, Lijuan <lijuan.tu@intel.com>
> Cc: Owen Hilyard <ohilyard@iol.unh.edu>; David Liu <dliu@iol.unh.edu>;
> dts@dpdk.org; Aaron Conole <aconole@redhat.com>; Thomas Monjalon
> <thomas@monjalon.net>
> Subject: Re: [dts] [PATCH] Revert "Strip prompt by default in send_expect"
>
> On Wed, May 26, 2021 at 2:23 PM David Marchand
> <david.marchand@redhat.com> wrote:
> >
> > On Wed, May 12, 2021 at 10:14 AM Lijuan Tu <lijuan.tu@intel.com> wrote:
> > >
> > > This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978.
> > > As it casued some cases failed:
> > > * flow_classify_softnic
> > > * test_ipv4_acl_jump
> > > * test_ipv4_acl_table
> > > * test_ipv6_hash_jump
> > > * unit_tests_loopback
> > > * test_link_mode
> > > * test_loopback_mode
> > > * distributor
> > > * maximum_workers
> >
> > Any update on having both worlds (UNH lab and those tests) coexist?
> >
> > I see an exhaustive list of tests that are broken with the new behavior.
> > Another approach to reverting the whole change is to pass
> > trim_whitespace= in the affected tests.
> > Was this idea considered?
Yes, we have accepted the idea, and patch was ready and passed our internal testing, but we found a new test suite power_bidirection_channel that also broken, and are working on fixing it.
>
> Ping.
>
>
> --
> David Marchand
@@ -79,19 +79,12 @@ class Crb(object):
self.alt_session = None
def send_expect(self, cmds, expected, timeout=TIMEOUT,
- alt_session=False, verify=False, trim_whitespace=True):
+ alt_session=False, verify=False):
"""
Send commands to crb and return string before expected string. If
there's no expected string found before timeout, TimeoutException will
be raised.
-
- By default, it will trim the whitespace from the expected string. This
- behavior can be turned off via the trim_whitespace argument.
"""
-
- if trim_whitespace:
- expected = expected.strip()
-
# sometimes there will be no alt_session like VM dut
if alt_session and self.alt_session:
return self.alt_session.session.send_expect(cmds, expected,