Skip to content

Commit

Permalink
PR 74: Merge AddChecksum to master
Browse files Browse the repository at this point in the history
 - Updated chocoaltey install to use Cehcksum +semver:minor
 - Updared version
 - Fixed bug in Test Plans where Query Based plans used fields that dont exist in
  • Loading branch information
MrHinsh committed Oct 21, 2016
1 parent 33a26f6 commit af79893
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
assembly-versioning-scheme: MajorMinorPatch
mode: ContinuousDeployment
continuous-delivery-fallback-tag: ''
next-version: 5.0.0
next-version: 5.3.0
branches:
master:
mode: ContinuousDeployment
Expand Down
2 changes: 1 addition & 1 deletion TfsWitMigrator.Console/Chocolatey/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if(test-path $vstssyncmigrationpath) {
Remove-Item "$($vstssyncmigrationpath)\*" -recurse -force
}

Install-ChocolateyZipPackage 'vsts-sm' 'https://github.com/nkdAgility/vsts-sync-migration/releases/download/#{GITVERSION.FULLSEMVER}#/vstsbulkeditor-#{GITVERSION.FULLSEMVER}#.zip' $vstssyncmigrationpath
Install-ChocolateyZipPackage 'vsts-sm' 'https://github.com/nkdAgility/vsts-sync-migration/releases/download/#{GITVERSION.FULLSEMVER}#/vstsbulkeditor-#{GITVERSION.FULLSEMVER}#.zip' $vstssyncmigrationpath -Checksum #{Chocolatey.FileHash}# -ChecksumType SHA256
write-host 'VSTS Sync Migration has been installed. Call `vsts-sm` from the command line to see options. You may need to close and reopen the command shell.'
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,31 @@ private ITestSuiteBase CreateNewRequirementTestSuite(ITestSuiteBase source, Work
private void SaveNewTestSuitToPlan(ITestPlan testPlan, IStaticTestSuite parent, ITestSuiteBase newTestSuite)
{
Trace.WriteLine(string.Format(" Saving {0} : {1} - {2} ", newTestSuite.TestSuiteType.ToString(), newTestSuite.Id, newTestSuite.Title), "TestPlansAndSuites");
((IStaticTestSuite)parent).Entries.Add(newTestSuite);
try
{
((IStaticTestSuite)parent).Entries.Add(newTestSuite);
}
catch (TestManagementServerException ex)
{
Telemetry.Current.TrackException(ex,
new Dictionary<string, string> {
{ "Name", Name},
{ "Target Project", me.Target.Name},
{ "Target Collection", me.Target.Collection.Name },
{ "Source Project", me.Source.Name},
{ "Source Collection", me.Source.Collection.Name },
{ "Status", Status.ToString() },
{ "Task", "SaveNewTestSuitToPlan" },
{ "Id", newTestSuite.Id.ToString()},
{ "Title", newTestSuite.Title},
{ "TestSuiteType", newTestSuite.TestSuiteType.ToString()}
});
Trace.WriteLine(string.Format(" FAILED {0} : {1} - {2} | {3}", newTestSuite.TestSuiteType.ToString(), newTestSuite.Id, newTestSuite.Title, ex.Message), "TestPlansAndSuites");
ITestSuiteBase ErrorSuitChild = targetTestStore.Project.TestSuites.CreateStatic();
ErrorSuitChild.TestSuiteEntry.Title = string.Format(@"BROKEN: {0} | {1}", newTestSuite.Title, ex.Message);
((IStaticTestSuite)parent).Entries.Add(ErrorSuitChild);
}

testPlan.Save();
}

Expand Down

0 comments on commit af79893

Please sign in to comment.