fix #11465: add validation checks for admin service (rebased) #1595
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
Conflicts: components/server/src/ome/logic/AdminImpl.java
Conflicts: components/server/src/ome/logic/AdminImpl.java
Conflicts: components/tools/OmeroJava/test/integration/AdminServiceTest.java
upgrading test in order to catch an exception
|
http://hudson.openmicroscopy.org.uk/job/OmeroJava-integration-develop/lastCompletedBuild/testngreports/integration/integration.AdminServiceTest/? is passing and the clients don't allow actions outlined in the ticket. Looks ok to merge. |
|
Both the travis build and a re-build failed due to timeouts (unrelated). Merging regardless. |
joshmoore
added a commit
that referenced
this pull request
Oct 8, 2013
fix #11465: add validation checks for admin service (rebased)
mtbc
added a commit
to mtbc/openmicroscopy
that referenced
this pull request
Nov 6, 2013
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.
Check that the integration tests in
AdminServiceTestseem to test what is described in https://trac.openmicroscopy.org.uk/ome/ticket/11465 and that they are passing.--rebased-from #1537
This is not a straight rebase: it has some conflict-fixing and extra tweaking.