summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-01-23 22:05:37 -0200
committerBruno Wagner <bwgpro@gmail.com>2015-01-23 22:05:37 -0200
commitb829e7aa18c22aac7a8256d5ee54149cc6f854b1 (patch)
tree9b77460aff13c1dda0678afdddd580405ccd463a
parent2848914c062589d5f8354753b084ed09062d67ef (diff)
Removed nosetests helper from search test, it is passing now
-rw-r--r--service/test/integration/test_search.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/service/test/integration/test_search.py b/service/test/integration/test_search.py
index 464830d2..1fb22a38 100644
--- a/service/test/integration/test_search.py
+++ b/service/test/integration/test_search.py
@@ -14,7 +14,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 *
@@ -23,7 +22,6 @@ class SearchTest(SoledadTestBase):
def setUp(self):
SoledadTestBase.setUp(self)
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
def test_that_tags_returns_all_tags(self):
input_mail = MailBuilder().with_tags(['important']).build_input_mail()
self.client.add_mail_to_inbox(input_mail)
@@ -40,7 +38,6 @@ class SearchTest(SoledadTestBase):
d.addCallback(_assert)
return d
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
def test_that_tags_are_filtered_by_query(self):
input_mail = MailBuilder().with_tags(['ateu', 'catoa', 'luat', 'zuado']).build_input_mail()
self.client.add_mail_to_inbox(input_mail)
@@ -57,7 +54,6 @@ class SearchTest(SoledadTestBase):
d.addCallback(_assert)
return d
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT)
def test_that_default_tags_are_ignorable(self):
input_mail = MailBuilder().with_tags(['sometag']).build_input_mail()
self.client.add_mail_to_inbox(input_mail)
@@ -71,7 +67,6 @@ class SearchTest(SoledadTestBase):
d.addCallback(_assert)
return d
- @deferred(timeout=SoledadTestBase.DEFERRED_TIMEOUT_LONG)
def test_tags_count(self):
self.client.add_multiple_to_mailbox(num=10, mailbox='inbox', flags=['\\Recent'])
self.client.add_multiple_to_mailbox(num=5, mailbox='inbox', flags=['\\Seen'])