resolve conflicts

sonic-net · Jan 9, 2025 · ad6b25e · ad6b25e
1 parent 82f7152
commit ad6b25e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/orchagent/port/portschema.h b/orchagent/port/portschema.h
@@ -102,5 +102,4 @@
 #define PORT_REUSE_THRESHOLD       "reuse_threshold"
 #define PORT_FLAP_PENALTY          "flap_penalty"
 #define PORT_DHCP_RATE_LIMIT       "dhcp_rate_limit"
-#define PORT_MODE                  "mode"
-
+#define PORT_MODE                  "mode"
diff --git a/tests/test_fgnhg.py b/tests/test_fgnhg.py
@@ -284,7 +284,6 @@ def create_interface_n_fg_ecmp_config(dvs, nh_range_start, nh_range_end, fg_nhg_
         dvs.port_admin_set(if_name_key, "up")
         shutdown_link(dvs, app_db, i)
         startup_link(dvs, app_db, i)
-        time.sleep(5)
         bank = 1
         if i >= (nh_range_end - nh_range_start)/2:
             bank = 0

diff --git a/tests/test_port_add_remove.py b/tests/test_port_add_remove.py
@@ -79,7 +79,7 @@ def test_remove_add_remove_port_with_buffer_cfg(self, dvs, testlog):
         config_db.delete_entry('PORT', PORT_A)
         num = asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_PORT",
                               num_of_ports-1,
-                              polling_config = PollingConfig(polling_interval = 1, timeout = 10.00, strict = True))
+                              polling_config = PollingConfig(polling_interval = 1, timeout = 5.00, strict = True))
 
         # verify that the port was removed properly since all buffer configuration was removed also
         assert len(num) == num_of_ports - 1