fix(consistent): align DPA2 curated case parameter order

Match the curated DPA2 case tuples with the unpack order used by the descriptor tests so direct_dist and update_g1_has_conv map to the intended fields.

Also move the regex import used for parameterized test-class name sanitization to module scope.

Authored by OpenClaw (model: gpt-5.4)

Author: njzjz-bot

source/tests/consistent/common.py

@@ -2,6 +2,7 @@
 import inspect
 import itertools
 import os
+import re
 import sys
 import unittest
 from abc import (
@@ -685,7 +686,6 @@ class TestClass(base_class):
             for x in pp:
                 s = str(x)
                 # replace non-alnum with underscore, collapse multiple underscores
-                import re
                 s = re.sub(r'[^a-zA-Z0-9_]', '_', s)
                 s = re.sub(r'_+', '_', s)
                 # remove leading/trailing underscores

source/tests/consistent/descriptor/test_dpa2.py

@@ -425,8 +425,8 @@ def data(self) -> dict:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -525,8 +525,8 @@ def skip_pt(self) -> bool:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -558,8 +558,8 @@ def skip_pd(self) -> bool:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -591,8 +591,8 @@ def skip_dp(self) -> bool:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -624,8 +624,8 @@ def skip_tf(self) -> bool:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -701,8 +701,8 @@ def setUp(self) -> None:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -807,8 +807,8 @@ def rtol(self) -> float:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -846,8 +846,8 @@ def atol(self) -> float:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,
@@ -894,8 +894,8 @@ def data(self) -> dict:
             repinit_set_davg_zero,
             repinit_type_one_side,
             repinit_use_three_body,
-            repformer_update_g1_has_conv,
             repformer_direct_dist,
+            repformer_update_g1_has_conv,
             repformer_update_g1_has_drrd,
             repformer_update_g1_has_grrg,
             repformer_update_g1_has_attn,