| Message ID | 20230428120113.2208516-1-xsimonar@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] Fix test "load-balancing" | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
Wow. Acked-by: Mark Michelson <mmichels@redhat.com> On 4/28/23 08:01, Xavier Simonart wrote: > This was always failing on some systems (but has no issues on others), > depending on which load balancer backend was used. > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > --- > tests/system-ovn.at | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index b46f67636..366cf5c71 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -1569,7 +1569,6 @@ bar3_ct=$(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | grep 172.16.1.4 -c) > AT_CHECK([test $(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | grep 172.16.1 -c) -ne 0]) > > if [[ "$bar1_ct" == "20" ]]; then > - AT_CHECK([test $bar1_ct -eq 20]) > AT_CHECK([test $bar2_ct -eq 0]) > AT_CHECK([test $bar3_ct -eq 0]) > else > @@ -1577,17 +1576,15 @@ else > fi > > if [[ "$bar2_ct" == "20" ]]; then > - AT_CHECK([test $bar1_ct -eq 20]) > - AT_CHECK([test $bar2_ct -eq 0]) > + AT_CHECK([test $bar1_ct -eq 0]) > AT_CHECK([test $bar3_ct -eq 0]) > else > AT_CHECK([test $bar2_ct -eq 0]) > fi > > if [[ "$bar3_ct" == "20" ]]; then > - AT_CHECK([test $bar1_ct -eq 20]) > + AT_CHECK([test $bar1_ct -eq 0]) > AT_CHECK([test $bar2_ct -eq 0]) > - AT_CHECK([test $bar3_ct -eq 0]) > else > AT_CHECK([test $bar3_ct -eq 0]) > fi
On Mon, May 1, 2023 at 9:35 PM Mark Michelson <mmichels@redhat.com> wrote: > Wow. > > Acked-by: Mark Michelson <mmichels@redhat.com> > > On 4/28/23 08:01, Xavier Simonart wrote: > > This was always failing on some systems (but has no issues on others), > > depending on which load balancer backend was used. > > > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > > --- > > tests/system-ovn.at | 7 ++----- > > 1 file changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > > index b46f67636..366cf5c71 100644 > > --- a/tests/system-ovn.at > > +++ b/tests/system-ovn.at > > @@ -1569,7 +1569,6 @@ bar3_ct=$(ovs-appctl dpctl/dump-conntrack | grep > 30.0.0.2 | grep 172.16.1.4 -c) > > AT_CHECK([test $(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | > grep 172.16.1 -c) -ne 0]) > > > > if [[ "$bar1_ct" == "20" ]]; then > > - AT_CHECK([test $bar1_ct -eq 20]) > > AT_CHECK([test $bar2_ct -eq 0]) > > AT_CHECK([test $bar3_ct -eq 0]) > > else > > @@ -1577,17 +1576,15 @@ else > > fi > > > > if [[ "$bar2_ct" == "20" ]]; then > > - AT_CHECK([test $bar1_ct -eq 20]) > > - AT_CHECK([test $bar2_ct -eq 0]) > > + AT_CHECK([test $bar1_ct -eq 0]) > > AT_CHECK([test $bar3_ct -eq 0]) > > else > > AT_CHECK([test $bar2_ct -eq 0]) > > fi > > > > if [[ "$bar3_ct" == "20" ]]; then > > - AT_CHECK([test $bar1_ct -eq 20]) > > + AT_CHECK([test $bar1_ct -eq 0]) > > AT_CHECK([test $bar2_ct -eq 0]) > > - AT_CHECK([test $bar3_ct -eq 0]) > > else > > AT_CHECK([test $bar3_ct -eq 0]) > > fi > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > Looks good to me, thanks. Acked-by: Ales Musil <amusil@redhat.com>
On 5/5/23 07:49, Ales Musil wrote: > On Mon, May 1, 2023 at 9:35 PM Mark Michelson <mmichels@redhat.com> wrote: > >> Wow. >> >> Acked-by: Mark Michelson <mmichels@redhat.com> >> >> On 4/28/23 08:01, Xavier Simonart wrote: >>> This was always failing on some systems (but has no issues on others), >>> depending on which load balancer backend was used. >>> >>> Signed-off-by: Xavier Simonart <xsimonar@redhat.com> >>> --- >>> tests/system-ovn.at | 7 ++----- >>> 1 file changed, 2 insertions(+), 5 deletions(-) >>> >>> diff --git a/tests/system-ovn.at b/tests/system-ovn.at >>> index b46f67636..366cf5c71 100644 >>> --- a/tests/system-ovn.at >>> +++ b/tests/system-ovn.at >>> @@ -1569,7 +1569,6 @@ bar3_ct=$(ovs-appctl dpctl/dump-conntrack | grep >> 30.0.0.2 | grep 172.16.1.4 -c) >>> AT_CHECK([test $(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | >> grep 172.16.1 -c) -ne 0]) >>> >>> if [[ "$bar1_ct" == "20" ]]; then >>> - AT_CHECK([test $bar1_ct -eq 20]) >>> AT_CHECK([test $bar2_ct -eq 0]) >>> AT_CHECK([test $bar3_ct -eq 0]) >>> else >>> @@ -1577,17 +1576,15 @@ else >>> fi >>> >>> if [[ "$bar2_ct" == "20" ]]; then >>> - AT_CHECK([test $bar1_ct -eq 20]) >>> - AT_CHECK([test $bar2_ct -eq 0]) >>> + AT_CHECK([test $bar1_ct -eq 0]) >>> AT_CHECK([test $bar3_ct -eq 0]) >>> else >>> AT_CHECK([test $bar2_ct -eq 0]) >>> fi >>> >>> if [[ "$bar3_ct" == "20" ]]; then >>> - AT_CHECK([test $bar1_ct -eq 20]) >>> + AT_CHECK([test $bar1_ct -eq 0]) >>> AT_CHECK([test $bar2_ct -eq 0]) >>> - AT_CHECK([test $bar3_ct -eq 0]) >>> else >>> AT_CHECK([test $bar3_ct -eq 0]) >>> fi >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >> > > Looks good to me, thanks. > > Acked-by: Ales Musil <amusil@redhat.com> > Thanks, Xavier, Ales and Mark! I applied this to the main branch and backported it to all branches down to 22.03 LTS. Regards, Dumitru
diff --git a/tests/system-ovn.at b/tests/system-ovn.at index b46f67636..366cf5c71 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -1569,7 +1569,6 @@ bar3_ct=$(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | grep 172.16.1.4 -c) AT_CHECK([test $(ovs-appctl dpctl/dump-conntrack | grep 30.0.0.2 | grep 172.16.1 -c) -ne 0]) if [[ "$bar1_ct" == "20" ]]; then - AT_CHECK([test $bar1_ct -eq 20]) AT_CHECK([test $bar2_ct -eq 0]) AT_CHECK([test $bar3_ct -eq 0]) else @@ -1577,17 +1576,15 @@ else fi if [[ "$bar2_ct" == "20" ]]; then - AT_CHECK([test $bar1_ct -eq 20]) - AT_CHECK([test $bar2_ct -eq 0]) + AT_CHECK([test $bar1_ct -eq 0]) AT_CHECK([test $bar3_ct -eq 0]) else AT_CHECK([test $bar2_ct -eq 0]) fi if [[ "$bar3_ct" == "20" ]]; then - AT_CHECK([test $bar1_ct -eq 20]) + AT_CHECK([test $bar1_ct -eq 0]) AT_CHECK([test $bar2_ct -eq 0]) - AT_CHECK([test $bar3_ct -eq 0]) else AT_CHECK([test $bar3_ct -eq 0]) fi
This was always failing on some systems (but has no issues on others), depending on which load balancer backend was used. Signed-off-by: Xavier Simonart <xsimonar@redhat.com> --- tests/system-ovn.at | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)