Merge pull request #842 from intersystems/csp-deploy-improvements

Clarify error message when importing web app files

Author: isc-pbarton

cls/SourceControl/Git/Utils.cls

@@ -1469,7 +1469,7 @@ ClassMethod ImportCSPFile(InternalName As %String) As %Status
     }
     // Delete original if exists, otherwise create new file
     if '(##class(%File).CopyFile(srcFile, cspFile, 1, .ret)) {
-        set sc = $$$ERROR($$$GeneralError,"Unable to copy CSP file from "_srcFile_" to "_cspFile_": return code "_ret)
+        set sc = $$$ERROR($$$GeneralError,"Unable to copy web application file from "_srcFile_" to "_cspFile_": return code "_ret)
     }
 
     Quit sc
@@ -3297,3 +3297,4 @@ ClassMethod IsSchemaStandard(pName As %String = "") As %Boolean [ Internal ]
 }
 
 }
+

test/UnitTest/SourceControl/Git/ImportAll.cls

@@ -1,6 +1,8 @@
 Class UnitTest.SourceControl.Git.ImportAll Extends UnitTest.SourceControl.Git.AbstractTest
 {
 
+Parameter WebAppName As STRING = "/csp/git/unittest/xsl";
+
 Property WebAppPath As %String;
 
 Method %OnNew(initvalue) As %Status
@@ -10,11 +12,11 @@ Method %OnNew(initvalue) As %Status
 	/// add mappings for MAC and CSP
 	Set settings = ##class(SourceControl.Git.Settings).%New()
 	Set settings.Mappings("MAC","*")="rtn/"
-	Set settings.Mappings("/CSP/","/csp/git/unittest/xsl")="csp/git/unittest/xsl"
+	Set settings.Mappings("/CSP/",..#WebAppName)="csp/git/unittest/xsl"
 	$$$ThrowOnError(settings.%Save())
 	set ..WebAppPath = ##class(%File).TempFilename()_"d"
 	do ##class(%File).CreateDirectoryChain(..WebAppPath)
-	do ..CreateTestWebApp("/csp/git/unittest/xsl", ..WebAppPath)
+	do ..CreateTestWebApp(..#WebAppName, ..WebAppPath)
 	return $$$OK
 }
 
@@ -43,7 +45,7 @@ ClassMethod DeleteTestWebApp(name)
 
 Method %OnClose() As %Status [ Private, ServerOnly = 1 ]
 {
-	do ..DeleteTestWebApp("/csp/git/unittest/xsl")
+	do ..DeleteTestWebApp(..#WebAppName)
 	do ##class(%File).RemoveDirectoryTree(..WebAppPath)
 	quit ##super()
 }