fix: add .skipEvaluationCount property

This is to even out the evaluations of expectations in the case where we skip evaluating states.

shared/packages/expectationManager/src/evaluationRunner/evaluateExpectationState.ts

@@ -23,6 +23,8 @@ export async function evaluateExpectationState(
 	const manager: InternalManager = runner.manager
 	const tracker: ExpectationTracker = runner.tracker
 
+	trackedExp.skipEvaluationCount = 0 // Reset the skip count
+
 	const timeSinceLastEvaluation = Date.now() - trackedExp.lastEvaluationTime
 	if (trackedExp.session.hadError) return // There was an error during the session.
 

shared/packages/expectationManager/src/evaluationRunner/evaluationRunner.ts

@@ -332,6 +332,10 @@ export class EvaluationRunner {
 			if (trackedWithState.length) {
 				// We're using a PromisePool so that we don't send out an unlimited number of parallel requests to the workers.
 
+				for (const trackedExp of trackedWithState) {
+					trackedExp.skipEvaluationCount++
+				}
+
 				const startTime = Date.now()
 				/** How long to wait before skipping ahead to process the next state */
 				const allowSkipTime =

shared/packages/expectationManager/src/lib/trackedExpectation.ts

@@ -27,6 +27,11 @@ export interface TrackedExpectation {
 	noAvailableWorkersReason: Reason
 	/** Timestamp of the last time the expectation was evaluated. */
 	lastEvaluationTime: number
+	/**
+	 * Number of times the expectation has been skipped (this is reset once the expectation is evaluated)
+	 * This is used to ensure that expectations are evaluated evenly
+	 */
+	skipEvaluationCount: number
 	/** Timestamp to track how long the expectation has been waiting for a worker (can't start working), used to request more resources */
 	waitingForWorkerTime: number | null
 	/** Timestamp to track  how long the expectation has been waiting for a worker, used to restart to re-query for workers */
@@ -78,6 +83,10 @@ export function sortTrackedExpectations(
 		if (aHadRecentError && !bHadRecentError) return 1
 		if (!aHadRecentError && bHadRecentError) return -1
 
+		// Highest skipEvaluationCount first
+		if (a.skipEvaluationCount < b.skipEvaluationCount) return 1
+		if (a.skipEvaluationCount > b.skipEvaluationCount) return -1
+
 		// Lowest priority first
 		if (a.exp.priority > b.exp.priority) return 1
 		if (a.exp.priority < b.exp.priority) return -1
@@ -109,6 +118,7 @@ export function getDefaultTrackedExpectation(
 			tech: 'N/A (init)',
 		},
 		lastEvaluationTime: 0,
+		skipEvaluationCount: 0,
 		waitingForWorkerTime: null,
 		noWorkerAssignedTime: null,
 		errorCount: 0,