Merge pull request #423 from daimor/task422

EnableEnsemble for Verify stage
intersystems · Sep 8, 2023 · 0e3d2d8 · 0e3d2d8
2 parents 852dbf7 + 67d2a57
commit 0e3d2d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/%ZPM/PackageManager/Developer/Lifecycle/Base.cls b/src/%ZPM/PackageManager/Developer/Lifecycle/Base.cls
@@ -1048,6 +1048,8 @@ Method %Verify(ByRef pParams) As %Status
 				// Create a new namespace and load the module in it.
 				#dim tNSConfig As %ZPM.PackageManager.Developer.ModuleSetting.NamespaceConfig
 				Set tNSConfig = ..Module.GetNamespaceConfig()
+        Set tSysReqs = ..Module.SystemRequirements
+        If $IsObject(tSysReqs), tSysReqs.Interoperability = "enabled" Set tNSConfig.EnableEnsemble = 1
 
 				// Create namespace in which to run tests and switch to it.
 				$$$ThrowOnError(##class(%ZPM.PackageManager.Developer.Build).InitializeNamespace("VERIFY",tVerbose,.tNewNamespace,tNSConfig))

diff --git a/src/%ZPM/PackageManager/Developer/SystemRequirements.cls b/src/%ZPM/PackageManager/Developer/SystemRequirements.cls
@@ -41,8 +41,7 @@ Method CheckVersion() As %Status
 
 Method CheckInteroperability() As %Status
 {
-
-	If ( (..Interoperability="enabled") && '##class(%EnsembleMgr).IsEnsembleNamespace($Namespace) ) {
+	If (..Interoperability="enabled") && (('##class(%EnsembleMgr).IsEnsembleNamespace($Namespace)) || ('##class(%EnsembleMgr).validateNamespace($Namespace, 1))) {
 		Return $$$ERROR($$$GeneralError, "The module requires Interoperability Production Enabled. Namespace <"_$Namespace_"> doesn't support Interoperability Production")
 	}
 	Return $$$OK