Merge lp:~zematynnad/ubuntu-webcatalog/fix_tests into lp:ubuntu-webcatalog

[Danny Tamez]

Fix tests on trunk

Overview
=========
This branch gets webcatlog trunk building again and fixes a few broken tests.

Details
========
test_requirements.txt was changed to require djang<1.4 so a 1.3x version would still be installed.

The links to http://ubuntu.com and https://canonical.com have changed to http://www.ubuntu.com and http://www.canonical.com respectively on the index page. It looks like the test was not yet updated.

Added a max_line_length attribute to the Options class as this was also causing the pep_8 test to fail.

To Test
=======
$fab bootstrap test

[Anthony Lenton (elachuni)]

Thanks for cleaning this up Danny!

review: Approve

=== modified file 'src/webcatalog/tests/test_pep8.py'
--- src/webcatalog/tests/test_pep8.py	2012-01-06 18:10:30 +0000
+++ src/webcatalog/tests/test_pep8.py	2012-03-26 17:08:47 +0000
@@ -57,6 +57,7 @@
             show_pep8 = False
             select = []
             ignore = []
+            max_line_length = 80
         pep8.options = Options()
         pep8.message = self.message
         Options.physical_checks = pep8.find_checks('physical_line')
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2012-03-20 22:23:31 +0000
+++ src/webcatalog/tests/test_views.py	2012-03-26 17:08:47 +0000
@@ -576,8 +576,8 @@
             "https://bugs.launchpad.net/ubuntu-webcatalog/+filebug",
             "http://developer.ubuntu.com",
             "https://launchpad.net/ubuntu-webcatalog",
-            "http://ubuntu.com",
-            "https://canonical.com",
+            "http://www.ubuntu.com",
+            "http://www.canonical.com",
             ]
         response = self.client.get(reverse('wc-index'))
         for link in links:
 
=== modified file 'test_requirements.txt'
--- test_requirements.txt	2011-11-22 08:49:31 +0000
+++ test_requirements.txt	2012-03-26 17:08:47 +0000
@@ -3,7 +3,7 @@
 # Installed /.../virtualenv/lib/python2.6/site-packages/django_preflight-0.1-py2.6.egg
 # error: Could not find required distribution django
 -f bzr+http://bazaar.launchpad.net/~elachuni/canonical-identity-provider/ssoclient#egg=ssoclient-1.0
-django
+django<1.4
 coverage
 mock
 piston-mini-client