Updated testsettings and loadtest files folder not to use the source #4041
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,7 +127,7 @@ function ComposeAccountUrl($connectedServiceUrl, $headers) | |
| #Load all dependent files for execution | ||
| . $PSScriptRoot/VssConnectionHelper.ps1 | ||
| $connectedServiceUrl = $connectedServiceUrl.TrimEnd('/') | ||
| Write-Host -NoNewline "Getting Clt Endpoint:" | ||
| $elsUrl = Get-CltEndpoint $connectedServiceUrl $headers | ||
|
|
||
| return $elsUrl | ||
|
|
@@ -149,34 +149,74 @@ function isNumericValue ($str) { | |
| return $isNum | ||
| } | ||
|
|
||
| function ValidateFiles($inputName, $loadtestDrop, $fileName, $testSettings) | ||
| { | ||
| # Upgrade scenario start.. | ||
| if (-Not([System.IO.Path]::IsPathRooted($loadtestDrop))) | ||
| { | ||
| $loadtestDrop=[System.IO.Path]::Combine($env:SYSTEM_DEFAULTWORKINGDIRECTORY,$loadtestDrop); | ||
| Write-Host -NoNewline "Updated test drop location is $loadtestDrop"; | ||
|
|
||
| if (-Not([string]::IsNullOrWhiteSpace($testSettings)) -and | ||
| -Not([System.IO.Path]::IsPathRooted($testSettings))) | ||
| { | ||
| $testSettings=[System.IO.Path]::Combine($env:SYSTEM_DEFAULTWORKINGDIRECTORY,$testSettings); | ||
| Write-Host -NoNewline "Updated test settings file is $testSettings"; | ||
| } | ||
| } | ||
| # Upgrade scenario end.. | ||
|
|
||
| # Validate if the drop folder location is correct... | ||
| if (-Not (Test-Path $loadtestDrop)) | ||
| { | ||
| ErrorMessage "The path for the load test files $loadtestDrop does not exist. Please provide a valid path." | ||
| } | ||
|
|
||
| $loadRunTestSettingsFile = $testSettings; | ||
| $file = Get-ChildItem -Path $loadtestDrop -recurse | Where-Object {$_.Name -eq $fileName} | Select-Object -First 1 | ||
| if ($file) | ||
| { | ||
| # Check for fileName | ||
| $global:ScopedTestDrop = $file.Directory.FullName; | ||
| $global:RunTestSettingsFile = ""; | ||
| Write-Host -NoNewline ("Selected load test file is '{0}' under '{1}'" -f $file.FullName, $global:ScopedTestDrop) | ||
| Write-Host -NoNewline "Test Drop location used for the run is $global:ScopedTestDrop. Please ensure all required files (test dlls, plugin dlls, dependent files) are part of this output folder" | ||
| if ([string]::IsNullOrWhiteSpace($loadRunTestSettingsFile)) | ||
|
There was a problem hiding this comment.
minor: you dont need to string check just doing if() would suffice. #WontFix |
||
| { | ||
| Write-Host -NoNewline "No test settings file specified"; | ||
| return; | ||
| } | ||
|
|
||
| if (-Not (Test-Path $loadRunTestSettingsFile)) | ||
| { | ||
| Write-Host -NoNewline "The path for the test settings file $loadRunTestSettingsFile does not exist" | ||
| if (-Not([System.IO.Path]::IsPathRooted($loadRunTestSettingsFile))) | ||
|
There was a problem hiding this comment.
if comment #1 is resolved, you will not need this. #WontFix |
||
| { | ||
| $loadRunTestSettingsFile = [System.IO.Path]::Combine($global:ScopedTestDrop, [System.IO.Path]::GetFileName($loadRunTestSettingsFile)); | ||
| Write-Host -NoNewline "Checking for test settings file $loadRunTestSettingsFile in the drop location" | ||
| } | ||
|
|
||
| if (Test-Path $loadRunTestSettingsFile) | ||
| { | ||
| Write-Host -NoNewline "Test settings file $loadRunTestSettingsFile found in the drop location" | ||
| } | ||
| else | ||
| { | ||
| ErrorMessage "TestSettings file $loadRunTestSettingsFile not found" | ||
| } | ||
| } | ||
|
|
||
| $global:RunTestSettingsFile = $loadRunTestSettingsFile; | ||
| } | ||
| else | ||
| { | ||
| ErrorMessage "LoadTest file $inputName is not present in the test drop." | ||
| } | ||
| } | ||
|
|
||
| function ValidateInputs($tfsCollectionUrl, $connectedServiceName, $testSettings, $loadtestDrop, $loadtest) | ||
| { | ||
| ValidateFiles "load test file" $loadtestDrop $loadTest $testSettings | ||
| } | ||
|
|
||
| function Get($headers, $uri) | ||
|
|
@@ -226,7 +266,7 @@ function StopTestRun($headers, $run, $CltAccountUrl) | |
| { | ||
| $stop = @" | ||
| { | ||
| "state": "aborted" | ||
| } | ||
| "@ | ||
| $uri = [String]::Format("{0}/_apis/clt/testruns/{1}?{2}", $CltAccountUrl, $run.id, $global:apiVersion) | ||
|
|
@@ -238,22 +278,30 @@ function StopTestRun($headers, $run, $CltAccountUrl) | |
|
|
||
| function ComposeTestRunJson($name, $tdid, $machineType) | ||
| { | ||
| $processPlatform = "x64" | ||
| $setupScript="" | ||
| $cleanupScript="" | ||
|
|
||
| if (-Not([string]::IsNullOrWhiteSpace($global:RunTestSettingsFile))) | ||
| { | ||
| [xml]$tsxml = Get-Content $global:RunTestSettingsFile | ||
| if ($tsxml.TestSettings.Scripts.setupScript) | ||
| { | ||
| $setupScript = [System.IO.Path]::GetFileName($tsxml.TestSettings.Scripts.setupScript) | ||
| Write-Host -NoNewline "RunSettings SetupScript : $setupScript" | ||
| } | ||
|
|
||
| if ($tsxml.TestSettings.Scripts.cleanupScript) | ||
| { | ||
| $cleanupScript = [System.IO.Path]::GetFileName($tsxml.TestSettings.Scripts.cleanupScript) | ||
| Write-Host -NoNewline "RunSettings CleanupScript : $cleanupScript" | ||
| } | ||
|
|
||
| if ($tsxml.TestSettings.Execution.hostProcessPlatform) | ||
| { | ||
| $processPlatform = $tsxml.TestSettings.Execution.hostProcessPlatform | ||
| Write-Host -NoNewline "RunSettings ProcessPlatform : $cleanupScript" | ||
| } | ||
| } | ||
|
|
||
| $trjson = @" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comment#1 -
this doesnt seem to be related/dependent on the outer if block. it can come out and stay along with the test settings section. #WontFix