diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
| commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
| tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /tests/unittest.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
| download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index a59291cc60..4d40bdb6a5 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -146,6 +146,13 @@ def DEBUG(target): return target +def INFO(target): + """A decorator to set the .loglevel attribute to logging.INFO. + Can apply to either a TestCase or an individual test method.""" + target.loglevel = logging.INFO + return target + + class HomeserverTestCase(TestCase): """ A base TestCase that reduces boilerplate for HomeServer-using test cases. @@ -373,5 +380,5 @@ class HomeserverTestCase(TestCase): self.render(request) self.assertEqual(channel.code, 200) - access_token = channel.json_body["access_token"].encode('ascii') + access_token = channel.json_body["access_token"] return access_token |