Skip to content

Commit e9258c1

Browse files
authored
Migrate UniversalPackagesV0 to Node 10 (#15848)
* UniversalPackagesV0 migrated to Node 10 * Common npm packages are used * timeout 5 sec
1 parent d18d69e commit e9258c1

File tree

10 files changed

+605
-269
lines changed

10 files changed

+605
-269
lines changed

Tasks/UniversalPackagesV0/Tests/L0.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ describe('UniversalPackages Suite', function () {
99
after(() => {
1010
});
1111

12-
it('downloads package from current organization', (done: MochaDone) => {
13-
this.timeout(1000);
12+
it('downloads package from current organization', function (done: Mocha.Done) {
13+
this.timeout(5000);
1414
let tp = path.join(__dirname, './downloadInternal.js')
1515
let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
1616

@@ -22,4 +22,4 @@ describe('UniversalPackages Suite', function () {
2222
assert.equal(tr.errorIssues.length, 0, "should have no errors");
2323
done();
2424
});
25-
});
25+
});

Tasks/UniversalPackagesV0/Tests/UniversalMockHelper.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { TaskLibAnswers, TaskLibAnswerExecResult } from 'azure-pipelines-task-lib/mock-answer';
22
import tmrm = require('azure-pipelines-task-lib/mock-run');
3-
import * as pkgMock from 'packaging-common/Tests/MockHelper';
4-
import * as artMock from 'packaging-common/Tests/ArtifactToolMockHelper';
3+
import * as pkgMock from 'azure-pipelines-tasks-packaging-common-v3/Tests/MockHelper';
4+
import * as artMock from 'azure-pipelines-tasks-packaging-common-v3/Tests/ArtifactToolMockHelper';
55

66
export class UniversalMockHelper {
77
private static ArtifactToolCmd: string = 'c:\\mock\\location\\ArtifactTool.exe';
@@ -21,7 +21,7 @@ export class UniversalMockHelper {
2121
this.tmr.setInput('verbosity', "verbose");
2222

2323
process.env['AGENT_HOMEDIRECTORY'] = "c:\\agent\\home\\directory";
24-
process.env['BUILD_SOURCESDIRECTORY'] = "c:\\agent\\home\\directory\\sources",
24+
process.env['BUILD_SOURCESDIRECTORY'] = "c:\\agent\\home\\directory\\sources";
2525
process.env['ENDPOINT_AUTH_SYSTEMVSSCONNECTION'] = "{\"parameters\":{\"AccessToken\":\"token\"},\"scheme\":\"OAuth\"}";
2626
process.env['ENDPOINT_URL_SYSTEMVSSCONNECTION'] = "https://example.visualstudio.com/defaultcollection";
2727
process.env['SYSTEM_DEFAULTWORKINGDIRECTORY'] = "c:\\agent\\home\\directory";
@@ -35,10 +35,10 @@ export class UniversalMockHelper {
3535
pkgMock.registerLocationHelpersMock(tmr);
3636
}
3737

38-
public mockUniversalCommand(command: string, feed:string, packageName: string, packageVersion: string, path: string, result: TaskLibAnswerExecResult, service?: string) {
38+
public mockUniversalCommand(command: string, feed: string, packageName: string, packageVersion: string, path: string, result: TaskLibAnswerExecResult, service?: string) {
3939
if (!service) {
4040
service = "https://example.visualstudio.com/defaultcollection";
4141
}
4242
this.answers.exec[`${UniversalMockHelper.ArtifactToolCmd} universal ${command} --feed ${feed} --service ${service} --package-name ${packageName} --package-version ${packageVersion} --path ${path} --patvar UNIVERSAL_DOWNLOAD_PAT --verbosity verbose`] = result;
4343
}
44-
}
44+
}

Tasks/UniversalPackagesV0/make.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)