fix L0 cross plat test failures

microsoft · Jun 14, 2017 · b170ecc · b170ecc
1 parent cc78b8e
commit b170ecc
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/Tasks/DotNetCoreCLI/Tests/PackTests/packEnvVar.ts b/Tasks/DotNetCoreCLI/Tests/PackTests/packEnvVar.ts
@@ -12,7 +12,7 @@ tmr.setInput('command', 'pack');
 tmr.setInput('searchPatternPack', 'foo.nuspec');
 tmr.setInput('outputDir', 'C:\\out\\dir');
 tmr.setInput('versioningScheme', 'byEnvVar');
-tmr.setInput('versionEnvVar', 'foobarVersionEnvVar');
+tmr.setInput('versionEnvVar', 'FOOBARVERSIONENVVAR');
 
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     "osType": {},
@@ -44,7 +44,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env['foobarVersionEnvVar'] = 'XX.YY.ZZ'
+process.env['FOOBARVERSIONENVVAR'] = 'XX.YY.ZZ'
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nuspec"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/DotNetCoreCLI/Tests/PushTests/internalFeed.ts b/Tasks/DotNetCoreCLI/Tests/PushTests/internalFeed.ts
@@ -38,6 +38,9 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     "rmRF": {
         "c:\\agent\\home\\directory\\NuGet_1": {
             "success": true
+        },
+        "c:\\agent\\home\\directory/NuGet_1": {
+            "success": true
         }
     },
     "findMatch": {

diff --git a/Tasks/Npm/Tests/npm-failureDumpsLog-workingDir.ts b/Tasks/Npm/Tests/npm-failureDumpsLog-workingDir.ts
@@ -16,7 +16,7 @@ tmr.mockNpmCommand('custom', {
     code: -1,
     stdout: 'some npm failure'
 } as TaskLibAnswerExecResult);
-tmr.answers.exist['C:\\mock\\workingDir\\npm-debug.log'] = true;
+tmr.answers.exist[path.join("C:\\mock\\workingDir", "npm-debug.log")] = true;
 
 let mockFs = require('fs');
 tmr.registerMock('fs', mockFs);

diff --git a/Tasks/NuGetCommand/Tests/PackTests/packEnvVar.ts b/Tasks/NuGetCommand/Tests/PackTests/packEnvVar.ts
@@ -13,7 +13,7 @@ tmr.setInput('searchPatternPack', 'foo.nuspec');
 tmr.setInput('outputDir', 'C:\\out\\dir');
 tmr.setInput('command', 'pack');
 tmr.setInput('versioningScheme', 'byEnvVar');
-tmr.setInput('versionEnvVar', 'foobarVersionEnvVar');
+tmr.setInput('versionEnvVar', 'FOOBARVERSIONENVVAR');
 
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
     "osType": {},
@@ -42,7 +42,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env['foobarVersionEnvVar'] = 'XX.YY.ZZ'
+process.env['FOOBARVERSIONENVVAR'] = 'XX.YY.ZZ'
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nuspec"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/NuGetCommand/Tests/PublishTests/externalFeedNuGet.ts b/Tasks/NuGetCommand/Tests/PublishTests/externalFeedNuGet.ts
@@ -38,7 +38,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env["NuGet_ForceNuGetForPush"] = "true";
+process.env["NUGET_FORCENUGETFORPUSH"] = "true";
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nupkg"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/NuGetCommand/Tests/PublishTests/internalFeedNuGet.ts b/Tasks/NuGetCommand/Tests/PublishTests/internalFeedNuGet.ts
@@ -39,7 +39,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env["NuGet_ForceNuGetForPush"] = "true";
+process.env["NUGET_FORCENUGETFORPUSH"] = "true";
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nupkg"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPush.ts b/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPush.ts
@@ -39,7 +39,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env["NuGet_ForceVstsNuGetPushForPush"] = "true";
+process.env["NUGET_FORCEVSTSNUGETPUSHFORPUSH"] = "true";
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nupkg"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPushAllowConflict.ts b/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPushAllowConflict.ts
@@ -39,7 +39,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env["NuGet_ForceVstsNuGetPushForPush"] = "true";
+process.env["NUGET_FORCEVSTSNUGETPUSHFORPUSH"] = "true";
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nupkg"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();

diff --git a/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPushDisallowConflict.ts b/Tasks/NuGetCommand/Tests/PublishTests/internalFeedVstsNuGetPushDisallowConflict.ts
@@ -39,7 +39,7 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
 };
 nmh.setAnswers(a);
 
-process.env["NuGet_ForceVstsNuGetPushForPush"] = "true";
+process.env["NUGET_FORCEVSTSNUGETPUSHFORPUSH"] = "true";
 nmh.registerNugetUtilityMock(["c:\\agent\\home\\directory\\foo.nupkg"]);
 nmh.registerDefaultNugetVersionMock();
 nmh.registerToolRunnerMock();