Skip to content

Fix Mockito trying to mock IOException that isn't thrown by method (#31433)#31527

Merged
original-brownbear merged 1 commit intoelastic:masterfrom
original-brownbear:31433
Jun 22, 2018
Merged

Fix Mockito trying to mock IOException that isn't thrown by method (#31433)#31527
original-brownbear merged 1 commit intoelastic:masterfrom
original-brownbear:31433

Conversation

@original-brownbear
Copy link
Copy Markdown
Contributor

@original-brownbear original-brownbear commented Jun 22, 2018

Fixes #31433 by removing trying to mock an IOException that isn't thrown by the sniffer anymore ever since 63f3a61

@original-brownbear original-brownbear mentioned this pull request Jun 22, 2018
Closed
cbuescher
cbuescher approved these changes Jun 22, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@original-brownbear
Copy link
Copy Markdown
Contributor Author

original-brownbear commented Jun 22, 2018

@cbuescher thanks!

@original-brownbear original-brownbear merged commit 3c42bfa into elastic:master Jun 22, 2018
@original-brownbear original-brownbear deleted the 31433 branch June 22, 2018 15:24
@cbuescher
Copy link
Copy Markdown
Member

cbuescher commented Jun 22, 2018

@original-brownbear no problem. Can you also backport this to 6.x and check if any other of the 6 branches that we currently run tests on need this? I only checked with 6.x, looks like this failure can also happen there at least.

@cbuescher
Copy link
Copy Markdown
Member

cbuescher commented Jun 22, 2018

The 6.3 branch seems to be okay, Sniffer#close() throws IOException there as far as I can tell.

dnhatn added a commit that referenced this pull request Jun 23, 2018
@dnhatn
Merge branch 'master' into ccr
08ee9b6 
* master:
  Add get field mappings to High Level REST API Client (#31423)
  [DOCS] Updates Watcher examples for code testing (#31152)
  TEST: Add bwc recovery tests with synced-flush index
  [DOCS] Move sql to docs (#31474)
  [DOCS] Move monitoring to docs folder (#31477)
  Core: Combine doExecute methods in TransportAction (#31517)
  IndexShard should not return null stats (#31528)
  fix repository update with the same settings but different type (#31458)
  Fix Mockito trying to mock IOException that isn't thrown by method (#31433) (#31527)
  Node selector per client rather than per request (#31471)
  Core: Combine messageRecieved methods in TransportRequestHandler (#31519)
  Upgrade to Lucene 7.4.0. (#31529)
  [ML] Add ML filter update API (#31437)
  Allow multiple unicast host providers (#31509)
  Avoid deprecation warning when running the ML datafeed extractor. (#31463)
  REST high-level client: add simulate pipeline API (#31158)
  Get Mapping API to honour allow_no_indices and ignore_unavailable (#31507)
  [PkiRealm] Invalidate cache on role mappings change (#31510)
  [Security] Check auth scheme case insensitively (#31490)
  In NumberFieldType equals and hashCode, make sure that NumberType is taken into account. (#31514)
  [DOCS] Fix REST tests in SQL docs
  [DOCS] Add code snippet testing in more ML APIs (#31339)
  Core: Remove ThreadPool from base TransportAction (#31492)
  [DOCS] Remove fixed file from build.gradle
  Rename createNewTranslog to fileBasedRecovery (#31508)
  Test: Skip assertion on windows
  [DOCS] Creates field and document level security overview (#30937)
  [DOCS] Significantly improve SQL docs
  [DOCS] Move migration APIs to docs (#31473)
  Core: Convert TransportAction.execute uses to client calls (#31487)
  Return transport addresses from UnicastHostsProvider (#31426)
  Ensure local addresses aren't null (#31440)
  Remove unused generic type for client execute method (#31444)
  Introduce http and tcp server channels (#31446)
jasontedor added a commit to hub-cap/elasticsearch that referenced this pull request Jun 25, 2018
@jasontedor
Merge remote-tracking branch 'elastic/master' into pr/31343
127799e 
* elastic/master: (92 commits)
  Reduce number of raw types warnings (elastic#31523)
  Migrate scripted metric aggregation scripts to ScriptContext design (elastic#30111)
  turn GetFieldMappingsResponse to ToXContentObject (elastic#31544)
  Close xcontent parsers (partial) (elastic#31513)
  Ingest Attachment: Upgrade Tika to 1.18 (elastic#31252)
  TEST: Correct the assertion arguments order (elastic#31540)
  Add get field mappings to High Level REST API Client (elastic#31423)
  [DOCS] Updates Watcher examples for code testing (elastic#31152)
  TEST: Add bwc recovery tests with synced-flush index
  [DOCS] Move sql to docs (elastic#31474)
  [DOCS] Move monitoring to docs folder (elastic#31477)
  Core: Combine doExecute methods in TransportAction (elastic#31517)
  IndexShard should not return null stats (elastic#31528)
  fix repository update with the same settings but different type (elastic#31458)
  Fix Mockito trying to mock IOException that isn't thrown by method (elastic#31433) (elastic#31527)
  Node selector per client rather than per request (elastic#31471)
  Core: Combine messageRecieved methods in TransportRequestHandler (elastic#31519)
  Upgrade to Lucene 7.4.0. (elastic#31529)
  [ML] Add ML filter update API (elastic#31437)
  Allow multiple unicast host providers (elastic#31509)
  ...
@cbuescher cbuescher added >test-failure Triaged test failures from CI v7.0.0 :Core/Infra/Monitoring DEPRECATED, DO NOT USE labels Jun 26, 2018
@elasticmachine
Copy link
Copy Markdown
Collaborator

elasticmachine commented Jun 26, 2018

Pinging @elastic/es-core-infra

original-brownbear added a commit that referenced this pull request Jun 26, 2018
@original-brownbear
Fix Mockito trying to mock IOException that isn't thrown by method (#…
77c5526 
…31433) (#31527)
@original-brownbear
Copy link
Copy Markdown
Contributor Author

original-brownbear commented Jun 26, 2018

@cbuescher back ported in 77c5526 :)

dnhatn added a commit that referenced this pull request Jun 26, 2018
@dnhatn
Merge branch '6.x' into ccr-6.x
e258970 
* 6.x:
  Fix broken backport of #31578 by adjusting constructor (#31587)
  ingest: Add ignore_missing property to foreach filter (#22147) (#31578)
  Add package pre-install check for java binary (#31343)
  Docs: Clarify sensitive fields watcher encryption (#31551)
  Watcher: Remove never executed code (#31135)
  Improve test times for tests using `RandomObjects::addFields` (#31556)
  Revert "Remove RestGetAllAliasesAction (#31308)"
  REST high-level client: add simulate pipeline API (#31158)
  Get Mapping API to honour allow_no_indices and ignore_unavailable (#31507)
  Fix Mockito trying to mock IOException that isn't thrown by method (#31433) (#31527)
  [Test] Add full cluster restart test for Rollup (#31533)
  Enhance thread context uniqueness assertion
  fix writeIndex evaluation for aliases (#31562)
  Add x-opaque-id to search slow logs (#31539)
  Watcher: Fix put watch action (#31524)
  [DOCS] Significantly improve SQL docs
  turn GetFieldMappingsResponse to ToXContentObject (#31544)
  TEST: Unmute testHistoryUUIDIsGenerated
  Ingest Attachment: Upgrade Tika to 1.18 (#31252)
  TEST: Correct the assertion arguments order (#31540)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cbuescher cbuescher cbuescher approved these changes

Assignees

No one assigned

Labels

:Core/Infra/Monitoring DEPRECATED, DO NOT USE >test-failure Triaged test failures from CI v6.4.0 v7.0.0-beta1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@original-brownbear @cbuescher @elasticmachine @colings86