summary refs log tree commit diff
path: root/tests/appservice/test_scheduler.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-02-19 15:55:02 +0000
committerMark Haines <mjark@negativecurvature.net>2016-02-19 15:55:02 +0000
commitb82d6f70a49faaf551e7709ddfd7a7607ade3e42 (patch)
treef13b8706f7cdc4faa6e44e207fd57d3cfe30f97f /tests/appservice/test_scheduler.py
parentAdd Measures to presence (diff)
parentFix flake8 warnings for tests (diff)
downloadsynapse-b82d6f70a49faaf551e7709ddfd7a7607ade3e42.tar.xz
Merge pull request #590 from matrix-org/markjh/formatting
Fix flake8 warnings for tests
Diffstat (limited to 'tests/appservice/test_scheduler.py')
-rw-r--r--tests/appservice/test_scheduler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/appservice/test_scheduler.py b/tests/appservice/test_scheduler.py

index c9c2d36210..631a229332 100644 --- a/tests/appservice/test_scheduler.py +++ b/tests/appservice/test_scheduler.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. -from synapse.appservice import ApplicationServiceState, AppServiceTransaction +from synapse.appservice import ApplicationServiceState from synapse.appservice.scheduler import ( _ServiceQueuer, _TransactionController, _Recoverer ) @@ -235,7 +235,7 @@ class ApplicationServiceSchedulerQueuerTestCase(unittest.TestCase): srv_2_event2 = Mock(event_id="srv2b") send_return_list = [srv_1_defer, srv_2_defer] - self.txn_ctrl.send = Mock(side_effect=lambda x,y: send_return_list.pop(0)) + self.txn_ctrl.send = Mock(side_effect=lambda x, y: send_return_list.pop(0)) # send events for different ASes and make sure they are sent self.queuer.enqueue(srv1, srv_1_event)