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.

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

Fix trx output of functional tests not to override each other #4302

Merged
merged 2 commits into from
Jun 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions tests/Scripts/RunP0Tests.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ REM Clean previous test results
if exist functionaltests.*.xml (
del functionaltests.*.xml
)
if exist resultsfile.*.trx (
del resultsfile.*.trx
if exist NuGetGallery.P0.*.trx (
del NuGetGallery.P0.*.trx
)
if exist TestResults (
rd TestResults /S /Q
Expand All @@ -44,11 +44,11 @@ call %xunit% "%testDir%\NuGetGallery.FunctionalTests.dll" -trait "Category=%test
if not "%errorlevel%"=="0" set exitCode=-1

REM Run web UI tests
call %mstest% /TestContainer:"NuGetGallery.WebUITests.P0\bin\%config%\NuGetGallery.WebUITests.P0.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web.trx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't the del at the top of the page delete the P0 results when P1 tests are run?
Perhaps we can use NuGetGallery.P0.WebUITests.trx and delete NuGetGallery.P0.*.trx.

call %mstest% /TestContainer:"NuGetGallery.WebUITests.P0\bin\%config%\NuGetGallery.WebUITests.P0.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P0.WebUITests.trx
if not "%errorlevel%"=="0" set exitCode=-1

REM Run Load tests
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:resultsfile.load.trx
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P0.LoadTests.trx
if not "%errorlevel%"=="0" set exitCode=-1

exit /B %exitCode%
Expand Down
8 changes: 4 additions & 4 deletions tests/Scripts/RunP1Tests.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ REM Clean previous test results
if exist functionaltests.*.xml (
del functionaltests.*.xml
)
if exist resultsfile.*.trx (
del resultsfile.*.trx
if exist NuGetGallery.P1.*.trx (
del NuGetGallery.P1.*.trx
)
if exist TestResults (
rd TestResults /S /Q
Expand All @@ -44,11 +44,11 @@ call %xunit% "%testDir%\NuGetGallery.FunctionalTests.dll" -trait "Category=%test
if not "%errorlevel%"=="0" set exitCode=-1

REM Run web UI tests
call %mstest% /TestContainer:"NuGetGallery.WebUITests.P1\bin\%config%\NuGetGallery.WebUITests.P1.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web.trx
call %mstest% /TestContainer:"NuGetGallery.WebUITests.P1\bin\%config%\NuGetGallery.WebUITests.P1.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P1.WebUITests.trx
if not "%errorlevel%"=="0" set exitCode=-1

REM Run Load tests
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:resultsfile.load.trx
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P1.LoadTests.trx
if not "%errorlevel%"=="0" set exitCode=-1

exit /B %exitCode%
Expand Down
8 changes: 4 additions & 4 deletions tests/Scripts/RunP2Tests.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ REM Clean previous test results
if exist functionaltests.*.xml (
del functionaltests.*.xml
)
if exist resultsfile.*.trx (
del resultsfile.*.trx
if exist NuGetGallery.P2.*.trx (
del NuGetGallery.P2.*.trx
)
if exist TestResults (
rd TestResults /S /Q
Expand All @@ -44,11 +44,11 @@ call %xunit% "%testDir%\NuGetGallery.FunctionalTests.dll" -trait "Category=%test
if not "%errorlevel%"=="0" set exitCode=-1

REM Run web UI and load tests
call %mstest% /TestContainer:"NuGetGallery.WebUITests.P2\bin\%config%\NuGetGallery.WebUITests.P2.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:resultsfile.web.trx
call %mstest% /TestContainer:"NuGetGallery.WebUITests.P2\bin\%config%\NuGetGallery.WebUITests.P2.dll" /TestSettings:Local.testsettings /detail:stdout /resultsfile:NuGetGallery.P2.WebUITests.trx
if not "%errorlevel%"=="0" set exitCode=-1

REM Run Load tests
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:resultsfile.load.trx
call %mstest% /TestContainer:"NuGetGallery.LoadTests\bin\%config%\NuGetGallery.LoadTests.dll" /TestSettings:Local.testsettings /detail:stdout /category:%testCategory% /resultsfile:NuGetGallery.P2.LoadTests.trx
if not "%errorlevel%"=="0" set exitCode=-1

exit /B %exitCode%
Expand Down