From 173c5f37e95502ea4240c48e4dc1af0c2a7c5cc0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 2 Oct 2013 19:36:13 +0100 Subject: [PATCH 19/22] Remove some tests for obsolete functionality --- tests/twisted/Makefile.am | 1 - tests/twisted/dispatcher/dispatch-obsolete.py | 51 --------------------------- 2 files changed, 52 deletions(-) delete mode 100644 tests/twisted/dispatcher/dispatch-obsolete.py diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 7c9d91d..93b8e5b 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -47,7 +47,6 @@ TWISTED_BASIC_TESTS = \ dispatcher/dispatch-activatable.py \ dispatcher/dispatch-before-connected.py \ dispatcher/dispatch-delayed-by-mini-plugin.py \ - dispatcher/dispatch-obsolete.py \ dispatcher/dispatch-rejected-by-mini-plugin.py \ dispatcher/dispatch-text.py \ dispatcher/ensure-and-redispatch.py \ diff --git a/tests/twisted/dispatcher/dispatch-obsolete.py b/tests/twisted/dispatcher/dispatch-obsolete.py deleted file mode 100644 index afe5df6..0000000 --- a/tests/twisted/dispatcher/dispatch-obsolete.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (C) 2009 Nokia Corporation -# Copyright (C) 2009 Collabora Ltd. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA - -import dbus -"""Regression test for dispatching an incoming Text channel from a CM without -Requests. -""" - -import dbus -import dbus.service - -from servicetest import EventPattern, tp_name_prefix, tp_path_prefix, \ - call_async -from mctest import exec_test, SimulatedConnection, SimulatedClient, \ - create_fakecm_account, enable_fakecm_account, SimulatedChannel, \ - expect_client_setup -import constants as cs - -def test(q, bus, mc): - params = dbus.Dictionary({"account": "someguy@example.com", - "password": "secrecy"}, signature='sv') - cm_name_ref, account = create_fakecm_account(q, bus, mc, params) - conn = enable_fakecm_account(q, bus, mc, account, params, - has_requests=False) - - q.expect_many( - EventPattern('dbus-signal', signal='AccountPropertyChanged', - predicate=lambda e: - e.args[0].get('ConnectionError') == - cs.SOFTWARE_UPGRADE_REQUIRED), - EventPattern('dbus-method-call', method='Disconnect', - handled=True), - ) - -if __name__ == '__main__': - exec_test(test, {}) -- 1.8.4.rc3