@@ -88,34 +88,37 @@ public AgentLogBase(ITestOutputHelper testLogger)
8888
8989 public abstract IEnumerable < string > GetFileLines ( ) ;
9090
91- public string GetAccountId ( TimeSpan ? timeoutOrZero = null )
91+ public string GetAccountId ( )
9292 {
93- var reportingAppLink = GetReportingAppLink ( timeoutOrZero ) ;
93+ var reportingAppLink = GetReportingAppLink ( ) ;
9494 var reportingAppUri = new Uri ( reportingAppLink ) ;
9595 var accountId = reportingAppUri . Segments [ 2 ] ;
9696 if ( accountId == null )
9797 throw new Exception ( "Could not find account ID in second segment of reporting app link: " + reportingAppLink ) ;
9898 return accountId . TrimEnd ( '/' ) ;
9999 }
100100
101- public string GetApplicationId ( TimeSpan ? timeoutOrZero = null )
101+ public string GetApplicationId ( )
102102 {
103- var reportingAppLink = GetReportingAppLink ( timeoutOrZero ) ;
103+ var reportingAppLink = GetReportingAppLink ( ) ;
104104 var reportingAppUri = new Uri ( reportingAppLink ) ;
105105 var applicationId = reportingAppUri . Segments [ 4 ] ;
106106 if ( applicationId == null )
107107 throw new Exception ( "Could not find application ID in second segment of reporting app link: " + reportingAppLink ) ;
108108 return applicationId . TrimEnd ( '/' ) ;
109109 }
110110
111- public string GetCrossProcessId ( TimeSpan ? timeoutOrZero = null )
111+ public string GetCrossProcessId ( )
112112 {
113113 return $@ "{ GetAccountId ( ) } #{ GetApplicationId ( ) } ";
114114 }
115115
116- public string GetReportingAppLink ( TimeSpan ? timeoutOrZero = null )
116+ private string GetReportingAppLink ( )
117117 {
118- var match = WaitForLogLine ( AgentReportingToLogLineRegex , timeoutOrZero ) ;
118+ var match = TryGetLogLine ( AgentReportingToLogLineRegex ) ;
119+ if ( ! match . Success || match . Groups . Count < 2 )
120+ throw new Exception ( "Could not find reporting app link in log file." ) ;
121+
119122 return match . Groups [ 1 ] . Value ;
120123 }
121124
@@ -164,23 +167,19 @@ public IEnumerable<Match> WaitForLogLines(string regularExpression, TimeSpan? ti
164167
165168 var timeout = timeoutOrZero ?? TimeSpan . Zero ;
166169
167- _testLogger ? . WriteLine ( $ "{ Timestamp } WaitForLogLines Waiting for expression: { regularExpression } . Duration: { timeout . TotalSeconds : N0} seconds. Minimum count: { minimumCount } ") ;
168-
169170 var timeTaken = Stopwatch . StartNew ( ) ;
170171 do
171172 {
172173 var matches = TryGetLogLines ( regularExpression ) . ToList ( ) ;
173174 if ( matches . Count >= minimumCount )
174175 {
175- _testLogger ? . WriteLine ( $ "{ Timestamp } WaitForLogLines Matched expression: { regularExpression } in { timeTaken . Elapsed . TotalSeconds : N1} s.") ;
176176 return matches ;
177177 }
178178
179179 Thread . Sleep ( TimeSpan . FromMilliseconds ( 100 ) ) ;
180180 } while ( timeTaken . Elapsed < timeout ) ;
181181
182182 var message = $ "{ Timestamp } Log line did not appear a minimum of { minimumCount } times within { timeout . TotalSeconds : N0} seconds. Expected line expression: { regularExpression } ";
183- _testLogger ? . WriteLine ( message ) ;
184183 throw new Exception ( message ) ;
185184 }
186185
0 commit comments