Fix tests for Python 2.6

playpauseandstop · playpauseandstop · commit 6d445e445f0c · 2012-10-30T10:59:08.000+02:00
diff --git a/learnpython/tests/test_flask.py b/learnpython/tests/test_flask.py
@@ -1,4 +1,4 @@
-from unittest import TestCase
+from unittest2 import TestCase
 
 from flask import url_for
 
diff --git a/learnpython/tests/test_twill.py b/learnpython/tests/test_twill.py
@@ -1,3 +1,5 @@
+import sys
+
 from random import choice, randint
 
 from twill.commands import config
@@ -8,6 +10,9 @@
     TEST_PHONE, TEST_SUBJECT, TestCase, Twill
 
 
+IS_PYTHON_26 = sys.version_info[:2] == (2, 6)
+
+
 class TestViewsWithTwill(TestCase):
 
     def tearDown(self):
@@ -164,13 +169,22 @@ def test_index(self):
             c.code(200)
             c.url(t.url(self.subscribe_url))
 
-            c.follow('Web flow')
-            c.code(200)
-            c.url(t.url(self.flows_url) + '#web$')
+            if IS_PYTHON_26:
+                c.go(t.url(self.flows_url))
+                c.code(200)
+                c.find('Web flow')
+                c.find('Advanced flow')
 
-            c.follow('Advanced flow')
-            c.code(200)
-            c.url(t.url(self.flows_url) + '#advanced$')
+                c.find('<div class="active tab" id="web">')
+                c.find('<div class="tab" id="advanced">')
+            else:
+                c.follow('Web flow')
+                c.code(200)
+                c.url(t.url(self.flows_url) + '#web$')
+
+                c.follow('Advanced flow')
+                c.code(200)
+                c.url(t.url(self.flows_url) + '#advanced$')
 
             c.follow('Learn Python')
             c.code(200)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from unittest import TestCase`
	`1`	`+from unittest2 import TestCase`
`2`	`2`
`3`	`3`	`from flask import url_for`
`4`	`4`