2828
2929## Checking MAPDL versions
3030from ansys .mapdl .core .database import MINIMUM_MAPDL_VERSION , DBDef , MapdlDb
31- from ansys .mapdl .core .database .database import FAILING_DATABASE_MAPDL
3231from ansys .mapdl .core .errors import MapdlRuntimeError , MapdlVersionError
3332from ansys .mapdl .core .misc import random_string
3433from conftest import ON_CI
@@ -43,25 +42,18 @@ def db(mapdl):
4342 pytest .skip ("Requires 'ansys.api.mapdl' package to at least v0.5.1." )
4443
4544 ## Checking MAPDL versions
46-
4745 mapdl_version = str (mapdl .version )
4846 if not server_meets_version (mapdl_version , MINIMUM_MAPDL_VERSION ):
4947 pytest .skip (
5048 f"This MAPDL version ({ mapdl_version } ) is not compatible with the Database module."
5149 )
5250
5351 ## Exceptions
54- # Exception for 22.2
55- if mapdl_version == "22.2" and ON_CI :
52+ if mapdl_version in ["22.2" , "23.1" , "23.2" , "24.1" , "24.2" , "25.1" ] and ON_CI :
5653 pytest .skip (
5754 f"This MAPDL version ({ mapdl_version } ) docker image seems to not support DB, but local does."
5855 )
5956
60- if mapdl_version in ["24.1" , "24.2" , "25.1" ]:
61- pytest .skip (
62- f"This MAPDL version ({ mapdl_version } ) does not support PyMAPDL Database."
63- )
64-
6557 if mapdl ._server_version < (0 , 4 , 1 ): # 2021R2
6658 ver_ = "." .join ([str (each ) for each in mapdl ._server_version ])
6759 pytest .skip (
@@ -112,17 +104,12 @@ def test_database_start_stop(mapdl):
112104 f"This MAPDL version ({ mapdl_version } ) is not compatible with the Database module."
113105 )
114106
115- # Exception for 22.2
116- if mapdl_version == "22.2" and ON_CI :
107+ # Exceptions
108+ if mapdl_version in [ "22.2" , "23.1" , "23.2" , "24.1" , "24.2" , "25.1" ] and ON_CI :
117109 pytest .skip (
118110 f"This MAPDL version ({ mapdl_version } ) docker image seems to not support DB, but local does."
119111 )
120112
121- if mapdl_version in FAILING_DATABASE_MAPDL :
122- pytest .skip (
123- f"This MAPDL version ({ mapdl_version } ) docker image does not support Database module."
124- )
125-
126113 # verify it can be created twice
127114 mapdl .prep7 ()
128115 for _ in range (2 ):
0 commit comments