Merge working scenario feature branch to master #41
Conversation
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
* Setup script * Clean up self-hosted WCF Test Service E2E * Support more than one parameter to build.cmd for OuterLoop Tests
* Port over scenario tests and rationalize names
* Remove packages.config references from ServiceModel.Scenarios.Common.csproj
* Change exception messages in TypedProxyTests to state "timed out" rather than "failed".
* Removing/replacing instances of Assert.True where it's no longer needed
for exception catching
* Modified a test to not use try { } catch { } Assert.True pattern
|
|
1 similar comment
|
|
roncain
added a commit
that referenced
this pull request
May 27, 2015
Merge working scenario feature branch to master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The scenario feature branch was getting a little messy with some errant commits and merges that weren't squashed (mainly responses to PR feedback).
We didn't want to squash all the way in order to preserve some git blame history, so this is the middle ground that we were able to strike between squashing and preserving all commits.
There were some funny merge errors as we were bringing the changes over - hence an additional fixup checkin (in case I messed something up - easy to revert/blame)