Skip to content
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

Fix bogus imports in tests #5154

Merged
merged 3 commits into from May 8, 2019

Conversation

Projects
None yet
2 participants
@babolivier
Copy link
Member

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 matrix-org/synapse-core May 8, 2019

babolivier added some commits May 8, 2019

@codecov

This comment has been minimized.

Copy link

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
@anoadragon453
Copy link
Member

left a comment

lgtm. thanks

@babolivier babolivier merged commit d216a36 into develop May 8, 2019

24 checks passed

buildkite/synapse Build #1273 passed (20 minutes, 5 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 16 seconds)
Details
buildkite/synapse/isort Passed (16 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (13 seconds)
Details
buildkite/synapse/packaging Passed (17 seconds)
Details
buildkite/synapse/pep-8 Passed (56 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (12 minutes, 37 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 51 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 54 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (8 minutes, 46 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (13 minutes, 40 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (13 minutes, 38 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 46 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 41 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (13 minutes, 43 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (13 minutes, 47 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 38 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch Coverage not affected.
Details
codecov/project 61.74% (target 0%)
Details

anoadragon453 added a commit that referenced this pull request May 8, 2019

Merge branch 'develop' into anoa/blacklist_fixes
* develop:
  Fix bogus imports in tests (#5154)

anoadragon453 added a commit that referenced this pull request May 10, 2019

Merge branch 'develop' into anoa/blacklist_ip_ranges
* 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.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.