summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuda Dornelles <dudassdornelles@gmail.com>2015-01-23 16:45:39 -0200
committerPixpoa pairing <pixpoapairing@pixelated-project.org>2015-01-23 16:53:27 -0200
commitacc4ce92046fd2c22fa847f6473f6ffee45659de (patch)
treefaa934c3ee36c263e99947b81bcd8365ce996275
parentb0b6b3e0fe78ddf5d55b079d9ca2e662b7e1af33 (diff)
Removing nosetests timeout limit from tests, now with trial we dont need that
-rw-r--r--service/test/integration/test_contacts.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/service/test/integration/test_contacts.py b/service/test/integration/test_contacts.py
index 925e5e02..bfa91ea4 100644
--- a/service/test/integration/test_contacts.py
+++ b/service/test/integration/test_contacts.py
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from nose.twistedtools import deferred
from test.support.integration import SoledadTestBase, MailBuilder
@@ -22,7 +21,6 @@ class ContactsTest(SoledadTestBase):
def setUp(self):
SoledadTestBase.setUp(self)
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
def test_TO_CC_and_BCC_fields_are_being_searched(self):
input_mail = MailBuilder().with_tags(['important']).build_input_mail()
self.client.add_mail_to_inbox(input_mail)
@@ -36,7 +34,6 @@ class ContactsTest(SoledadTestBase):
d.addCallback(_assert)
return d
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
def test_trash_and_drafts_mailboxes_are_being_ignored(self):
self.client.add_multiple_to_mailbox(1, mailbox='INBOX', to='recipient@inbox.com')
self.client.add_multiple_to_mailbox(1, mailbox='DRAFTS', to='recipient@drafts.com')