Index: svn/Helper.cls.xml =================================================================== diff -u -r1549 -r1551 --- svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1549) +++ svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1551) @@ -100,7 +100,7 @@ %GlobalCharacterStream - + %Boolean @@ -115,15 +115,28 @@ %String + +1 +%String + + + 1 +UitvoerenUnitTesten:%Boolean 0){ Do SvnHelper.MailGefaaldeSvnCommands("GetLatest") - }ElseIf(SvnHelper.MustRunUnitTest){ + }ElseIf(UitvoerenUnitTesten && SvnHelper.IsCodeVeranderd){ Do SvnHelper.VoerUitUnitTesten() } Do SvnHelper.Failed.Clear() }Catch E{ - #dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace() + #dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam() + #dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace() #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() #dim From As %String = $$$SystemMail(ServerNaam_" - Subversion") #dim MailTo As %String = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed")) - Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion GetLatest() failed on ["_ServerNaam_"]",Exception.ToString(),0) + Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion GetLatest() failed on ["_ServerNaam_" => "_Namespace_"]",Exception.ToString(),0) } Set $$$SVNGlobal("SourceControl","SVN","UnitTestInProcess") = 0 ]]> @@ -157,7 +171,6 @@ Do ##class(vhUnitTest.Manager).RunTest("/MailOnError=1") Set $$$SVNGlobal("SourceControl","SVN","UnitTestInProcess") = 0 } - Set ..MustRunUnitTest = 0 ]]> @@ -166,14 +179,13 @@ 0 { - Set FeedbackStream = ##class(%GlobalCharacterStream).%New() - Do FeedbackStream.WriteLine("Server : "_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()) - Do FeedbackStream.WriteLine("Namespace : "_##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()) - Do FeedbackStream.WriteLine() - Do FeedbackStream.CopyFrom(..GeefFailedCharacterStream(Actie)) - #dim From As %String = $$$SystemMail($$$Server_" - Subversion") + #dim FeedbackStream As %CharacterStream = ..GeefFailedCharacterStream(Actie) + + #dim ServerNaam As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam() + #dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace() + #dim From As %String = $$$SystemMail(ServerNaam_" - Subversion") #dim MailTo As %String = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed")) - Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion failed on ["_$$$Server_"]",FeedbackStream,1) + Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion failed on ["_ServerNaam_" => "_Namespace_"]",FeedbackStream,1) } ]]> @@ -483,7 +495,7 @@ 0) + Set ..IsCodeVeranderd = (..ToCompile.List.Count() > 0) for i=1:1:..ToCompile.List.Count() { set SourceCode = ..ToCompile.List.GetAt(i) @@ -1288,7 +1300,7 @@ 1 %Status 1 + + +%String +1 + +