Skip to content
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

Users/suaggar/revert debug changes #11174

Merged
merged 4 commits into from
Aug 21, 2019
Merged

Users/suaggar/revert debug changes #11174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ae05dc
print env var
suaggar Aug 21, 2019
f543f25
reverting debug changes
suaggar Aug 21, 2019
eef53dd
Merge branch 'master' of https://github.com/Microsoft/vsts-tasks
suaggar Aug 21, 2019
19d452b
reverting debug changes
suaggar Aug 21, 2019
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
2 changes: 1 addition & 1 deletion Tasks/DotNetCoreInstallerV1/Tests/L0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ describe('DotNetCoreInstaller', function () {
});

it("[VersionFetcher.DotNetCoreVersionFetcher] getVersionInfo should return latest version info even if includePreviewVersion is true but latest version is non preview", (done) => {
process.env["__versionSpec__"] = "2.3.x";
process.env["__versionspec__"] = "2.3.x";
process.env["__inlcudepreviewversion__"] = "true";
let tr = new ttm.MockTestRunner(path.join(__dirname, "versionFetcherGetVersionInfoTestsCorrect.js"));
tr.run();
Expand Down
2 changes: 1 addition & 1 deletion Tasks/KubernetesV0/Tests/TestShared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export let TestEnvVars = {
configMapFile: "__configMapFile__",
configMapArguments: "__configMapArguments__",
versionOrLocation: "__versionOrLocation__",
versionSpec: "__versionSpec__",
versionSpec: "__versionspec__",
checkLatest: "__checkLatest__",
specifyLocation: "__specifyLocation__",
outputFormat: "__outputFormat__",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/KubernetesV1/Tests/TestShared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export let TestEnvVars = {
configMapFile: "__configMapFile__",
configMapArguments: "__configMapArguments__",
versionOrLocation: "__versionOrLocation__",
versionSpec: "__versionSpec__",
versionSpec: "__versionspec__",
checkLatest: "__checkLatest__",
specifyLocation: "__specifyLocation__",
outputFormat: "__outputFormat__",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/UseDotNetV2/Tests/L0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ describe('UseDotNet', function () {
});

it("[VersionFetcher.DotNetCoreVersionFetcher] getVersionInfo should return latest version info even if includePreviewVersion is true but latest version is non preview", (done) => {
process.env["__versionSpec__"] = "2.3.x";
process.env["__versionspec__"] = "2.3.x";
process.env["__inlcudepreviewversion__"] = "true";
let tr = new ttm.MockTestRunner(path.join(__dirname, "versionFetcherGetVersionInfoTestsCorrect.js"));
tr.run();
Expand Down
5 changes: 0 additions & 5 deletions Tests/lib/Start-TestRunner.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ function Invoke-Test {

# Record the original environment variables.
$originalEnv = @{ }
Write-Host "Environment path variable1: "
foreach ($envVar in (Get-ChildItem -LiteralPath env:)) {
Write-Host $envVar.Name + ": " + $envVar.Value
$originalEnv[$envVar.Name] = $envVar.Value
}

Expand All @@ -73,10 +71,7 @@ while ($true) {

# Cleanup the environment variables.
$currentMatches = @{ }
Get-ChildItem -LiteralPath env:
foreach ($envVar in (Get-ChildItem -LiteralPath env:)) {
Write-Host "Environment key2: '$envVar.Name'"
Write-Host "Environment value2: '$envVar.Value'"
# Remove the environment variable if it is new.
if (!$originalEnv.ContainsKey($envVar.Name)) {
Remove-Item -LiteralPath $envVar.PSPath
Expand Down
7 changes: 2 additions & 5 deletions Tests/lib/psRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import child = require('child_process');
var shell = require('shelljs');

function debug(message) {
//if (process.env['TASK_TEST_TRACE']) {
if (process.env['TASK_TEST_TRACE']) {
console.log(message);
//}
}
}

export function testSupported() {
Expand Down Expand Up @@ -40,9 +40,6 @@ export class PSRunner extends events.EventEmitter {

public start(): void {
this.emit('starting');

console.log("##############################printing env var");
console.log(process.env);

var defer = Q.defer<void>();
this._childProcess = child.spawn(
Expand Down