This repository was archived by the owner on Nov 9, 2022. It is now read-only.
changes for issue 863#864
Closed
tdiepenbrock wants to merge 2 commits intomarklogic-community:devfrom
Closed
Conversation
Contributor
|
There is a merge conflict, which usually means your local git repo is out of date. Can you git fetch upstream, and then git rebase remotes/upstream/dev? |
Contributor
|
I think we also need to compare with #852, there seems to be an overlap? |
* dev: marklogic-community#854 ignore suite*.[xqy|sjs]; don't return test elements for them Because the suite* modules weren't in $test-ignore-list, they were included in the list of tests to be run. Also, don't return test elements for suite setup and teardown, or the test numbers get inflated. Make sure return values are handled correctly On failed assertion, return a stack trace instead of throwing an exception refactoring to reduce repeated code Avoid returning 409 for failed tests; refactor The code was returning HTTP 409 when a test failed. server_config.rb then watched for that and used it to return a fail code to the command line. Revised the code to look for errors in the returned text instead. Returning 409 was causing the UI to take an error path, thus not displaying some useful information. Updating github org Fixing self-test issues Synched up self-test files across ml7/8/9 Fix marklogic-community#585 Removed some debug logging marklogic-community#809: forgot to apply unique-attributes on groups marklogic-community#809: fixed typo in validate-install (rarely used) Fixed marklogic-community#809, marklogic-community#810, marklogic-community#811: pass through, and preserve comments, indent config, and fix conflicting attrs Fixed marklogic-community#831: forgot to apply xquery_safe on properties map # Conflicts: # deploy/lib/xquery/setup.xqy
Contributor
|
The file changes aren't clean for some reason. Can you rebase rather than merge? |
Contributor
|
This PR was replaced by PR #866. Again, thanks @tdiepenbrock, your code changes were definitely useful! Just couldn't merge this PR since it was unclean, so cleaned up manually, and merged pieces from multiple PRs! |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
This commit contains changes for issue 863. These changes are confined to the setup:configure-indexes(), setup:add-geospatial-path-indexes(), setup:add-geospatial-region-path-indexes(), and setup:add-fields() functions, although I think other hunks got staged/committed. #863