From da31a8212666a270961c6ea5a528c1e1647326d1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zayakin Date: Thu, 17 Aug 2023 11:54:13 +0300 Subject: [PATCH] Add replace in assert policy and fix policy Signed-off-by: Dmitriy Zayakin --- .../testsuites/network/test_node_management.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pytest_tests/testsuites/network/test_node_management.py b/pytest_tests/testsuites/network/test_node_management.py index 844bd9c..79f6fd3 100644 --- a/pytest_tests/testsuites/network/test_node_management.py +++ b/pytest_tests/testsuites/network/test_node_management.py @@ -246,7 +246,7 @@ class TestNodeManagement(ClusterTestBase): {3}, ), ( - "REP 1 CBF 1 SELECT 1 FROM LOC_SPB FILTER 'UN-LOCODE' EQ 'RU LED' AS LOC_SPB", + "REP 1 IN SEL_SPB CBF 1 SELECT 1 FROM LOC_SPB AS SEL_SPB FILTER 'UN-LOCODE' EQ 'RU LED' AS LOC_SPB", 1, {2}, ), @@ -263,23 +263,23 @@ class TestNodeManagement(ClusterTestBase): {1, 2, 3, 4}, ), ( - "REP 1 CBF 1 SELECT 1 FROM LOC_SPB " + "REP 1 IN SEL_SPB CBF 1 SELECT 1 FROM LOC_SPB AS SEL_SPB " "FILTER 'UN-LOCODE' NE 'RU MOW' AND 'UN-LOCODE' NE 'SE STO' AND 'UN-LOCODE' NE 'FI HEL' AS LOC_SPB", 1, {2}, ), ( - "REP 2 CBF 1 SELECT 2 FROM LOC_RU FILTER SubDivCode NE 'AB' AND SubDivCode NE '18' AS LOC_RU", + "REP 2 IN SEL CBF 1 SELECT 2 FROM LOC_RU AS SEL FILTER SubDivCode NE 'AB' AND SubDivCode NE '18' AS LOC_RU", 2, {1, 2}, ), ( - "REP 2 CBF 1 SELECT 2 FROM LOC_RU FILTER Country EQ 'Russia' AS LOC_RU", + "REP 2 IN SEL_EU CBF 1 SELECT 2 FROM LOC_RU AS SEL_EU FILTER Country EQ 'Russia' AS LOC_RU", 2, {1, 2}, ), ( - "REP 2 CBF 1 SELECT 2 FROM LOC_EU FILTER Country NE 'Russia' AS LOC_EU", + "REP 2 IN SEL_EU CBF 1 SELECT 2 FROM LOC_EU AS SEL_EU FILTER Country NE 'Russia' AS LOC_EU", 2, {3, 4}, ), @@ -462,7 +462,7 @@ class TestNodeManagement(ClusterTestBase): got_policy = placement_policy_from_container( get_container(wallet, cid, json_mode=False, shell=self.shell, endpoint=endpoint) ) - assert got_policy == placement_rule.replace( + assert got_policy.replace("'", "") == placement_rule.replace( "'", "" ), f"Expected \n{placement_rule} and got policy \n{got_policy} are the same" oid = put_object_to_random_node(