Revert "tmp: Run all Cancellation / Migration tests pre_merge"

kthui · kthui · commit 6144d78404f9 · 2025-12-08T16:38:09.000-08:00
This reverts commit 6924769. Signed-off-by: Jacky <18255193+kthui@users.noreply.github.com>
diff --git a/tests/fault_tolerance/cancellation/test_sglang.py b/tests/fault_tolerance/cancellation/test_sglang.py
@@ -25,7 +25,7 @@
     pytest.mark.sglang,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 
diff --git a/tests/fault_tolerance/cancellation/test_trtllm.py b/tests/fault_tolerance/cancellation/test_trtllm.py
@@ -26,7 +26,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 
diff --git a/tests/fault_tolerance/cancellation/test_vllm.py b/tests/fault_tolerance/cancellation/test_vllm.py
@@ -25,7 +25,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 
diff --git a/tests/fault_tolerance/migration/test_sglang.py b/tests/fault_tolerance/migration/test_sglang.py
@@ -28,7 +28,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 
diff --git a/tests/fault_tolerance/migration/test_trtllm.py b/tests/fault_tolerance/migration/test_trtllm.py
@@ -28,7 +28,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 
diff --git a/tests/fault_tolerance/migration/test_vllm.py b/tests/fault_tolerance/migration/test_vllm.py
@@ -28,7 +28,7 @@
     pytest.mark.gpu_1,
     pytest.mark.e2e,
     pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),
-    pytest.mark.pre_merge,  # post_merge to pinpoint failure commit
+    pytest.mark.post_merge,  # post_merge to pinpoint failure commit
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`pytest.mark.sglang,`
`26`	`26`	`pytest.mark.e2e,`
`27`	`27`	`pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),`
`28`		`- pytest.mark.pre_merge, # post_merge to pinpoint failure commit`
	`28`	`+ pytest.mark.post_merge, # post_merge to pinpoint failure commit`
`29`	`29`	`]`
`30`	`30`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`pytest.mark.gpu_1,`
`27`	`27`	`pytest.mark.e2e,`
`28`	`28`	`pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),`
`29`		`- pytest.mark.pre_merge, # post_merge to pinpoint failure commit`
	`29`	`+ pytest.mark.post_merge, # post_merge to pinpoint failure commit`
`30`	`30`	`]`
`31`	`31`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`pytest.mark.gpu_1,`
`29`	`29`	`pytest.mark.e2e,`
`30`	`30`	`pytest.mark.model(FAULT_TOLERANCE_MODEL_NAME),`
`31`		`- pytest.mark.pre_merge, # post_merge to pinpoint failure commit`
	`31`	`+ pytest.mark.post_merge, # post_merge to pinpoint failure commit`
`32`	`32`	`]`
`33`	`33`
`34`	`34`