Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix bogus imports in tests #5154

Merged
merged 3 commits into from
May 8, 2019
Merged

Fix bogus imports in tests #5154

merged 3 commits into from
May 8, 2019

Conversation

babolivier
Copy link
Contributor

@babolivier babolivier commented May 8, 2019

Looks like I should have merged develop into my branches before merging #5083 and #5128 as it didn't keep up with the recent changes to the admin API code.

@babolivier babolivier requested a review from a team May 8, 2019 20:18
@codecov
Copy link

codecov bot commented May 8, 2019

Codecov Report

❗ No coverage uploaded for pull request base (develop@c0e0740). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             develop    #5154   +/-   ##
==========================================
  Coverage           ?   61.74%           
==========================================
  Files              ?      336           
  Lines              ?    34632           
  Branches           ?     5688           
==========================================
  Hits               ?    21383           
  Misses             ?    11721           
  Partials           ?     1528

Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

lgtm. thanks

@babolivier babolivier merged commit d216a36 into develop May 8, 2019
anoadragon453 added a commit that referenced this pull request May 8, 2019
* develop:
  Fix bogus imports in tests (#5154)
anoadragon453 added a commit that referenced this pull request May 10, 2019
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...
@babolivier babolivier deleted the babolivier/fix_import_test branch September 27, 2019 09:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants