Index: svn/Helper.cls.xml =================================================================== diff -u -r1695 -r1701 --- svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1695) +++ svn/Helper.cls.xml (.../Helper.cls.xml) (revision 1701) @@ -181,33 +181,35 @@ if '$length(BezwarenGetLatest) { Set SvnHelper = ##class(svn.Helper).%New() - If ##class(svn.Setting).IsUnitTestBezig() { - Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kan geen GetLatest uitvoeren omdat er nog unit testen aan het lopen zijn.")) - } - - Do SvnHelper.VoerUitGetLatest() - If (SvnHelper.IsGetLatestGefaald){ - Do SvnHelper.MailGefaaldeSvnCommands("GetLatest") - }ElseIf(UitvoerenUnitTesten && (SvnHelper.IsCodeVeranderd || ForceVoerUitTesten)){ - If WelkeTesten = ..#UnitTesten { - Do SvnHelper.VoerUitUnitTesten() - /// Na Unit Testen, de IntegratieTesten Initialiseren - #dim ForceTesting As %Boolean = 1 - JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",3,1,..#IntegratieTesten,ForceTesting) - }ElseIf WelkeTesten = ..#IntegratieTesten { - Do SvnHelper.VoerUitIntegratieTesten() - } - } + If $$$Not(##class(svn.Setting).IsUnitTestBezig()) { + Do SvnHelper.VoerUitGetLatest() + If (SvnHelper.IsGetLatestGefaald){ + Do SvnHelper.MailGefaaldeSvnCommands("GetLatest") + } ElseIf(UitvoerenUnitTesten && (SvnHelper.IsCodeVeranderd || ForceVoerUitTesten)){ + If WelkeTesten = ..#UnitTesten { + Do SvnHelper.VoerUitUnitTesten() + /// Na Unit Testen, de IntegratieTesten Initialiseren + #dim ForceTesting As %Boolean = 1 + JOB ClassMethod^vhLib("svn.Helper","GetLatestJob",3,1,..#IntegratieTesten,ForceTesting) + }ElseIf WelkeTesten = ..#IntegratieTesten { + Do SvnHelper.VoerUitIntegratieTesten() + } + } + } Do SvnHelper.Failed.Clear() } else { do ##class(vhLib.Logger).%New("SVN").Info("GetLatestJob","Bezwaren : "_BezwarenGetLatest) } Quit OnError Set $ZTRAP = "" - Set Exception = ##class(TECH.ExceptionHandler).Catch() - Set From = $$$SystemMail(..GeefServerNaam()_" - Subversion") - Set MailTo = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed")) + #dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch() + #dim From As %String = $$$SystemMail(..GeefServerNaam()_" - Subversion") + #dim MailTo As %Stringb = $listbuild($$$SVNGlobal("SourceControl","SVN","MailWhenFailed")) + #dim Onderwerp As %String = "Subversion GetLatest() failed on ["_..GeefServerNaam()_" => "_..GeefNamespace()_"]" + + Do ##class(vhLib.Logger).%New().ErrorMail(Onderwerp,Exception.ToString()) + Do SendMiniMailForced^vhLib.Mail(From,MailTo,"Subversion GetLatest() failed on ["_..GeefServerNaam()_" => "_..GeefNamespace()_"]",Exception.ToString(),0) ]]> @@ -323,8 +325,6 @@ do ..ToCompile.List.Insert(SourceCode) } - Do ..VoegToeNietCompileerdeClassenAanCompileList() - if (..ToCompile.List.Count() > 0) { if flagRecompile { #dim idxSource As %String ="" @@ -352,23 +352,6 @@ ]]> - - - - 1