diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-03 14:55:45 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-03 14:55:45 -0400 |
| commit | fb0df75a064ab161714cd61c09887c16a0711c60 (patch) | |
| tree | cbad87cd2f78860f12946a4a00bfdd5deb83971f | |
| parent | 38d1bcb8dd34c4d7a4fa713667a4b38e527f5d6e (diff) | |
| parent | 86497126150ae26503d4bf0f258c90be277d3919 (diff) | |
| download | askbot-fb0df75a064ab161714cd61c09887c16a0711c60.tar.gz askbot-fb0df75a064ab161714cd61c09887c16a0711c60.tar.bz2 askbot-fb0df75a064ab161714cd61c09887c16a0711c60.zip | |
Merge branch 'github'
| -rw-r--r-- | askbot/tests/cache_tests.py | 15 | ||||
| -rw-r--r-- | askbot/tests/email_parsing_tests.py | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/askbot/tests/cache_tests.py b/askbot/tests/cache_tests.py index 5740cc2a..e0703d08 100644 --- a/askbot/tests/cache_tests.py +++ b/askbot/tests/cache_tests.py @@ -11,16 +11,19 @@ class CacheTests(AskbotTestCase): self.post_answer(user=user, question=self.question) settings.DEBUG = True # because it's forsed to False + def tearDown(self): + settings.DEBUG = False + def visit_question(self): self.client.get(self.question.get_absolute_url(), follow=True) - + def test_anonymous_question_cache(self): self.visit_question() - counter = len(connection.queries) - print 'we have %d queries' % counter + before_count = len(connection.queries) self.visit_question() - #second hit to the same question should give fewer queries - self.assertTrue(counter > len(connection.queries)) - settings.DEBUG = False + after_count = len(connection.queries) + self.assertTrue(before_count > after_count, + ('Expected fewer queries after calling visit_question. ' + + 'Before visit: %d. After visit: %d.') % (before_count, after_count)) diff --git a/askbot/tests/email_parsing_tests.py b/askbot/tests/email_parsing_tests.py index 3ed0908a..9a5ff126 100644 --- a/askbot/tests/email_parsing_tests.py +++ b/askbot/tests/email_parsing_tests.py @@ -18,12 +18,7 @@ class EmailParsingTests(utils.AskbotTestCase): def test_clean_email_body(self): cleaned_body = mail.clean_html_email(self.rendered_template) - print "EXPECTED BODY" - print self.expected_output - print '==================================================' - print cleaned_body - print "CLEANED BODY" - self.assertEqual(cleaned_body, self.expected_output) + self.assertEqual(self.expected_output, cleaned_body) def test_gmail_rich_text_response_stripped(self): text = u'\n\nthis is my reply!\n\nOn Wed, Oct 31, 2012 at 1:45 AM, <kp@kp-dev.askbot.com> wrote:\n\n> **\n> ' |