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

Put python's logs into Trial when running unit tests #3319

Merged
merged 3 commits into from Jun 4, 2018

Conversation

hawkowl
Copy link
Contributor

@hawkowl hawkowl commented Jun 1, 2018

No description provided.

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

looks good, modulo the fact the build is failing.

@@ -14,21 +14,30 @@
# limitations under the License.
import twisted
from twisted.trial import unittest
from synapse.util.logcontext import LoggingContextFilter
from twisted.logger import Logger, LogLevel
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should use absolute names for these (import twisted.logger; tx_log=twisted.logger.Logger()) to reduce confusion between twisted and stdlib logging infrastructure

@@ -14,21 +14,30 @@
# limitations under the License.
import twisted
from twisted.trial import unittest
from synapse.util.logcontext import LoggingContextFilter
Copy link
Member

Choose a reason for hiding this comment

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

ftr, PEP8 has some opinions on import order which we try to follow - in this case that means that imports from synapse go after those from twisted. OTOH this file already breaks the convention by putting import logging at the end so <shrug>

@richvdh richvdh assigned hawkowl and unassigned richvdh Jun 1, 2018
@hawkowl hawkowl merged commit 5dbf305 into develop Jun 4, 2018
@hawkowl hawkowl deleted the hawkowl/logging-to-trial branch June 4, 2018 06:06
neilisfragile added a commit that referenced this pull request Jun 6, 2018
Changes in synapse v0.31.0 (2018-06-06)
======================================

Most notable change from v0.30.0 is to switch to python prometheus library to improve system
stats reporting. WARNING this changes a number of prometheus metrics in a
backwards-incompatible manner. For more details, see
`docs/metrics-howto.rst <docs/metrics-howto.rst#removal-of-deprecated-metrics--time-based-counters-becoming-histograms-in-0310>`_.

Bug Fixes:

* Fix metric documentation tables (PR #3341)
* Fix LaterGuage error handling (694968f)
* Fix replication metrics (b7e7fd2)

Changes in synapse v0.31.0-rc1 (2018-06-04)
==========================================

Features:

* Switch to the Python Prometheus library (PR #3256, #3274)
* Let users leave the server notice room after joining (PR #3287)

Changes:

* daily user type phone home stats (PR #3264)
* Use iter* methods for _filter_events_for_server (PR #3267)
* Docs on consent bits (PR #3268)
* Remove users from user directory on deactivate (PR #3277)
* Avoid sending consent notice to guest users (PR #3288)
* disable CPUMetrics if no /proc/self/stat (PR #3299)
* Add local and loopback IPv6 addresses to url_preview_ip_range_blacklist (PR #3312) Thanks to @thegcat!
* Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (PR #3307)
* Add private IPv6 addresses to example config for url preview blacklist (PR #3317) Thanks to @thegcat!
* Reduce stuck read-receipts: ignore depth when updating (PR #3318)
* Put python's logs into Trial when running unit tests (PR #3319)

Changes, python 3 migration:

* Replace some more comparisons with six (PR #3243) Thanks to @NotAFile!
* replace some iteritems with six (PR #3244) Thanks to @NotAFile!
* Add batch_iter to utils (PR #3245) Thanks to @NotAFile!
* use repr, not str (PR #3246) Thanks to @NotAFile!
* Misc Python3 fixes (PR #3247) Thanks to @NotAFile!
* Py3 storage/_base.py (PR #3278) Thanks to @NotAFile!
* more six iteritems (PR #3279) Thanks to @NotAFile!
* More Misc. py3 fixes (PR #3280) Thanks to @NotAFile!
* remaining isintance fixes (PR #3281) Thanks to @NotAFile!
* py3-ize state.py (PR #3283) Thanks to @NotAFile!
* extend tox testing for py3 to avoid regressions (PR #3302) Thanks to @krombel!
* use memoryview in py3 (PR #3303) Thanks to @NotAFile!

Bugs:

* Fix federation backfill bugs (PR #3261)
* federation: fix LaterGauge usage (PR #3328) Thanks to @intelfx!
@richvdh
Copy link
Member

richvdh commented Jun 8, 2018

This is all very well, but how do I get the damn logs out when I run the tests?

@hawkowl
Copy link
Contributor Author

hawkowl commented Jun 8, 2018 via email

@richvdh
Copy link
Member

richvdh commented Jun 10, 2018

hrm ok, but it seems very sparse. Is there a way to make it do debug logs?

@richvdh
Copy link
Member

richvdh commented Jun 14, 2018

[it seems to do debug logs just fine. I'm not sure what I was smoking on Sunday.]

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.

None yet

2 participants