-
Notifications
You must be signed in to change notification settings - Fork 314
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
Sync command stop-on-error flag #3500
Merged
Merged
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
ec85541
sync command stop-on-error flag
oscarssanchez c16488a
PHPCS
oscarssanchez ec8e02f
evaluate array items strictly
oscarssanchez 50bc2a7
Move stop on error feature to IndexHelper
oscarssanchez 47e74da
Set show errors when using --stop-on-error flag
oscarssanchez ee77bab
Add since tag to testSyncStopOnError
oscarssanchez 2b5e286
Rename test name
oscarssanchez 93a5d35
Mock stop on error test
oscarssanchez efc6761
Merge branch 'develop' into feature/stop-on-errors-cli
oscarssanchez 3d6780b
Redo fake request mock
oscarssanchez 2d4ab0e
Call correct mocked method
oscarssanchez 417fb94
Rollback test approach
oscarssanchez eb4268b
Merge branch 'develop' into feature/stop-on-errors-cli
oscarssanchez 4d33a36
PHP lint fix
oscarssanchez cd73cd9
Merge branch 'feature/stop-on-errors-cli' of github.com:10up/ElasticP…
oscarssanchez c0139e5
Switch method to create dummy post
oscarssanchez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PHPCS
- Loading branch information
commit c16488a546ea59d7fcbcac9c3fda755c89608f36
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -934,44 +934,50 @@ public function testRequest() { | |
* Expect an error message that stops the sync instead of a warning. | ||
*/ | ||
public function testSyncStopOnError() { | ||
add_filter( 'http_response', function( $request ) { | ||
$fake_request = json_decode( wp_remote_retrieve_body( $request ) ); | ||
add_filter( | ||
'http_response', | ||
function( $request ) { | ||
$fake_request = json_decode( wp_remote_retrieve_body( $request ) ); | ||
|
||
if ( ! empty( $fake_request->items ) ) { | ||
$fake_request->errors = true; | ||
|
||
if ( ! empty( $fake_request->items ) ) { | ||
$fake_request->errors = true; | ||
$fake_item = new \stdClass(); | ||
$fake_item->index = new \stdClass(); | ||
$fake_item->index->error = new \stdClass(); | ||
$fake_item->index->status = 400; | ||
$fake_item->index->_id = 10; | ||
$fake_item->index->type = '_doc'; | ||
$fake_item->index->_index = 'dummy-index'; | ||
$fake_item->index->error->reason = 'my dummy error reason'; | ||
$fake_item->index->error->type = 'my dummy error type'; | ||
|
||
$fake_item = new \stdClass(); | ||
$fake_item->index = new \stdClass(); | ||
$fake_item->index->error = new \stdClass(); | ||
$fake_item->index->status = 400; | ||
$fake_item->index->_id = 10; | ||
$fake_item->index->type = '_doc'; | ||
$fake_item->index->_index = 'dummy-index'; | ||
$fake_item->index->error->reason = 'my dummy error reason'; | ||
$fake_item->index->error->type = 'my dummy error type'; | ||
$fake_request->items[0] = $fake_item; | ||
|
||
$fake_request->items[0] = $fake_item; | ||
$request['body'] = wp_json_encode( $fake_request ); | ||
|
||
$request['body'] = wp_json_encode( $fake_request ); | ||
return $request; | ||
} | ||
|
||
return $request; | ||
} | ||
|
||
return $request; | ||
} ); | ||
); | ||
|
||
Indexables::factory()->get( 'post' )->delete_index(); | ||
|
||
$this->ep_factory->post->create_many( 10 ); | ||
|
||
$this->expectExceptionMessage( '10 (Post): [my dummy error type] my dummy error reason' ); | ||
|
||
$this->command->sync( [], [ | ||
'setup' => true, | ||
'show-errors' => true, | ||
'stop-on-error' => true, | ||
'yes' => true, | ||
] ); | ||
$this->command->sync( | ||
[], | ||
[ | ||
'setup' => true, | ||
'show-errors' => true, | ||
'stop-on-error' => true, | ||
'yes' => true, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to make sure it already works with the minimal case, can we remove the setup, show-errors, and the yes flags? |
||
] | ||
); | ||
} | ||
|
||
/** | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a blocker but for newer tests we are using snake-case for test names. Do you mind renaming it to
test_sync_stop_on_error()
? We'll have a follow up issue to rename all test methods.