diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-01-09 14:21:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 14:21:03 +0000 |
| commit | a767f06e3f2b2c15a779c1f9df7d358255ebe38c (patch) | |
| tree | babd2110f8b0d964f157e14d096273ee37a8abd0 | |
| parent | Merge pull request #2763 from matrix-org/rav/fix_config_uts (diff) | |
| parent | enable twisted delayedcall debugging in UTs (diff) | |
| download | synapse-a767f06e3f2b2c15a779c1f9df7d358255ebe38c.tar.xz | |
Merge pull request #2765 from matrix-org/rav/fix_room_uts
Fix flaky test_rooms UTs
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 3 | ||||
| -rw-r--r-- | tests/unittest.py | 6 | ||||
| -rw-r--r-- | tests/utils.py | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index de376fb514..9f37255381 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -515,9 +515,6 @@ class RoomsCreateTestCase(RestTestCase): synapse.rest.client.v1.room.register_servlets(hs, self.mock_resource) - def tearDown(self): - pass - @defer.inlineCallbacks def test_post_room_no_keys(self): # POST with no config keys, expect new room id diff --git a/tests/unittest.py b/tests/unittest.py index 38715972dd..7b478c4294 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +import twisted from twisted.trial import unittest import logging @@ -65,6 +65,10 @@ class TestCase(unittest.TestCase): @around(self) def setUp(orig): + # enable debugging of delayed calls - this means that we get a + # traceback when a unit test exits leaving things on the reactor. + twisted.internet.base.DelayedCall.debug = True + old_level = logging.getLogger().level if old_level != level: diff --git a/tests/utils.py b/tests/utils.py index ed8a7360f5..44e5f75093 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -58,6 +58,10 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config.email_enable_notifs = False config.block_non_admin_invites = False + # disable user directory updates, because they get done in the + # background, which upsets the test runner. + config.update_user_directory = False + config.use_frozen_dicts = True config.database_config = {"name": "sqlite3"} config.ldap_enabled = False |