fix test

Author: Han Wang

source/tests/common/dpmodel/test_fitting_invar_fitting.py

@@ -142,19 +142,22 @@ def test_self_exception(
                 iap = None
             with self.assertRaises(ValueError) as context:
                 ret0 = ifn0(dd[0][:, :, :-2], atype, fparam=ifp, aparam=iap)
-                self.assertIn("input descriptor", context.exception)
+            self.assertIn("input descriptor", str(context.exception))
 
             if nfp > 0:
                 ifp = rng.normal(size=(self.nf, nfp - 1))
                 with self.assertRaises(ValueError) as context:
                     ret0 = ifn0(dd[0], atype, fparam=ifp, aparam=iap)
-                    self.assertIn("input fparam", context.exception)
+                self.assertIn("input fparam", str(context.exception))
 
             if nap > 0:
+                # restore correct ifp before testing aparam
+                if nfp > 0:
+                    ifp = rng.normal(size=(self.nf, nfp))
                 iap = rng.normal(size=(self.nf, self.nloc, nap - 1))
                 with self.assertRaises(ValueError) as context:
                     ifn0(dd[0], atype, fparam=ifp, aparam=iap)
-                    self.assertIn("input aparam", context.exception)
+                self.assertIn("input aparam", str(context.exception))
 
     def test_get_set(self) -> None:
         ifn0 = InvarFitting(

source/tests/pt_expt/fitting/test_fitting_invar_fitting.py

@@ -172,7 +172,7 @@ def test_self_exception(
                     fparam=ifp,
                     aparam=iap,
                 )
-                self.assertIn("input descriptor", str(context.exception))
+            self.assertIn("input descriptor", str(context.exception))
 
             if nfp > 0:
                 ifp = torch.from_numpy(rng.normal(size=(self.nf, nfp - 1))).to(
@@ -185,9 +185,14 @@ def test_self_exception(
                         fparam=ifp,
                         aparam=iap,
                     )
-                    self.assertIn("input fparam", str(context.exception))
+                self.assertIn("input fparam", str(context.exception))
 
             if nap > 0:
+                # restore correct ifp before testing aparam
+                if nfp > 0:
+                    ifp = torch.from_numpy(rng.normal(size=(self.nf, nfp))).to(
+                        self.device
+                    )
                 iap = torch.from_numpy(
                     rng.normal(size=(self.nf, self.nloc, nap - 1))
                 ).to(self.device)
@@ -198,7 +203,7 @@ def test_self_exception(
                         fparam=ifp,
                         aparam=iap,
                     )
-                    self.assertIn("input aparam", str(context.exception))
+                self.assertIn("input aparam", str(context.exception))
 
     def test_get_set(self) -> None:
         ifn0 = InvarFitting(