fix more merge issues

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
sonic-net · Nov 8, 2021 · 5d670fa · 5d670fa
1 parent f6d7881
commit 5d670fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/test_flex_counters.py b/tests/test_flex_counters.py
@@ -155,12 +155,12 @@ def test_flex_counters(self, dvs, counter_type):
 
         if counter_type == "port_counter":
             self.verify_only_phy_ports_created()
-        else if counter_type == "rif_counter":
+        elif counter_type == "rif_counter":
             self.config_db.db_connection.hdel('INTERFACE|Ethernet0|192.168.0.1/24', "NULL")
         elif counter_type == "acl_counter":
             self.config_db.delete_entry('ACL_RULE', 'DATAACL|RULE0')
             self.config_db.delete_entry('ACL_TABLE', 'DATAACL')
-        else if counter_type == "vxlan_tunnel_counter":
+        elif counter_type == "vxlan_tunnel_counter":
             self.verify_tunnel_type_vxlan(counter_map, TUNNEL_TYPE_MAP)
             self.config_db.delete_entry("VLAN","Vlan10")
             self.config_db.delete_entry("VLAN_TUNNEL","vtep1")