Skip to content

Refactor: Move sleep function to shared module and import it #1700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shati-patel merged 1 commit into from
Nov 2, 2022
Merged

Refactor: Move sleep function to shared module and import it #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions extensions/ql-vscode/src/pure/time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ function createFormatter(unit: string) {
unitDisplay: 'long'
});
}

export async function sleep(ms: number) {
return new Promise(resolve => setTimeout(resolve, ms));
}
7 changes: 2 additions & 5 deletions extensions/ql-vscode/src/remote-queries/remote-queries-monitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as vscode from 'vscode';
import { Credentials } from '../authentication';
import { Logger } from '../logging';
import { sleep } from '../pure/time';
import { getWorkflowStatus, isArtifactAvailable, RESULT_INDEX_ARTIFACT_NAME } from './gh-api/gh-actions-api-client';
import { RemoteQuery } from './remote-query';
import { RemoteQueryWorkflowResult } from './remote-query-workflow-result';
Expand Down Expand Up @@ -30,7 +31,7 @@ export class RemoteQueriesMonitor {
let attemptCount = 0;

while (attemptCount <= RemoteQueriesMonitor.maxAttemptCount) {
await this.sleep(RemoteQueriesMonitor.sleepTime);
await sleep(RemoteQueriesMonitor.sleepTime);

if (cancellationToken && cancellationToken.isCancellationRequested) {
return { status: 'Cancelled' };
Expand Down Expand Up @@ -70,10 +71,6 @@ export class RemoteQueriesMonitor {
void this.logger.log('Variant analysis monitoring timed out after 2 days');
return { status: 'Cancelled' };
}

private async sleep(ms: number) {
return new Promise(resolve => setTimeout(resolve, ms));
}
}


7 changes: 2 additions & 5 deletions extensions/ql-vscode/src/remote-queries/variant-analysis-monitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import { VariantAnalysisMonitorResult } from './shared/variant-analysis-monitor-result';
import { processUpdatedVariantAnalysis } from './variant-analysis-processor';
import { DisposableObject } from '../pure/disposable-object';
import { sleep } from '../pure/time';

export class VariantAnalysisMonitor extends DisposableObject {
// With a sleep of 5 seconds, the maximum number of attempts takes
Expand Down Expand Up @@ -40,7 +41,7 @@ export class VariantAnalysisMonitor extends DisposableObject {
const scannedReposDownloaded: number[] = [];

while (attemptCount <= VariantAnalysisMonitor.maxAttemptCount) {
await this.sleep(VariantAnalysisMonitor.sleepTime);
await sleep(VariantAnalysisMonitor.sleepTime);

if (cancellationToken && cancellationToken.isCancellationRequested) {
return { status: 'Canceled' };
Expand Down Expand Up @@ -108,8 +109,4 @@ export class VariantAnalysisMonitor extends DisposableObject {

return downloadedRepos;
}

private async sleep(ms: number) {
return new Promise(resolve => setTimeout(resolve, ms));
}
}
5 changes: 1 addition & 4 deletions extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { slurpQueryHistory, splatQueryHistory } from '../../query-serialization'
import { formatLegacyMessage, QueryInProgress } from '../../legacy-query-server/run-queries';
import { EvaluationResult, QueryResultType } from '../../pure/legacy-messages';
import Sinon = require('sinon');
import { sleep } from '../../pure/time';

describe('query-results', () => {
let disposeSpy: sinon.SinonSpy;
Expand Down Expand Up @@ -455,10 +456,6 @@ describe('query-results', () => {
}
}

async function sleep(ms: number) {
return new Promise(resolve => setTimeout(resolve, ms));
}

function createMockQueryWithResults(
queryPath: string,
didRunSuccessfully = true,
Expand Down