Merge lp:~elachuni/ubuntu-webcatalog/nothingness into lp:ubuntu-webcatalog

[Anthony Lenton]

A couple of minor pep8 fixes and test improvements.

This branch originally intended to have any fixes necessary for working with postgresql 9.1, but none were necessary.

So, it just has a couple of minor pep8 fixes, and changes to make a preflight test not hit the wire.

Also the "public url" for preflight was removed, as we don't have the same setup for our production config branch that's not used in the end, and it involved another test that delayed a couple of seconds setting up an openid transaction with staging sso.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2012-05-30 21:57:52 +0000
+++ django_project/urls.py	2012-06-21 20:36:21 +0000
@@ -29,8 +29,6 @@
     url(r'^cat/', include('webcatalog.urls')),
     url(r'^admin/', include(admin.site.urls)),
     (r'^preflight/$', include('preflight.urls')),
-    url(r'^\+preflight/$', redirect_to,
-        {'url': '/openid/login?next=/preflight/'}),
     url(r'^$', redirect_to, {'url': '/cat/'}),
 
     # OpenID views

=== modified file 'src/webcatalog/management/commands/import_all_app_install_data.py'
--- src/webcatalog/management/commands/import_all_app_install_data.py	2012-06-08 14:39:14 +0000
+++ src/webcatalog/management/commands/import_all_app_install_data.py	2012-06-21 20:36:21 +0000
@@ -35,7 +35,7 @@
     def handle_noargs(self, **options):
         self.verbosity = int(options['verbosity'])
         for distroseries in settings.UBUNTU_SERIES_FOR_VERSIONS.values():
-            self.output("Importing app-install-data for {0}".format(
+            self.output("Importing app-install-data for {0}\n".format(
                 distroseries), 1)
             call_command('import_app_install_data', distroseries)
 

=== modified file 'src/webcatalog/management/commands/import_all_ratings_stats.py'
--- src/webcatalog/management/commands/import_all_ratings_stats.py	2012-06-08 14:47:54 +0000
+++ src/webcatalog/management/commands/import_all_ratings_stats.py	2012-06-21 20:36:21 +0000
@@ -35,7 +35,7 @@
     def handle_noargs(self, **options):
         self.verbosity = int(options['verbosity'])
         for distroseries in settings.UBUNTU_SERIES_FOR_VERSIONS.values():
-            self.output("Importing ratings stats for {0}".format(
+            self.output("Importing ratings stats for {0}\n".format(
                 distroseries), 1)
             call_command('import_ratings_stats', distroseries)
 

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-06-20 16:56:53 +0000
+++ src/webcatalog/tests/test_commands.py	2012-06-21 20:36:21 +0000
@@ -454,7 +454,7 @@
         firefox = Application.objects.get(package_name='firefox')
         self.assertEqual(self.FIREFOX_DESCRIPTION, firefox.description)
 
-    def _make_desktop_file(self, package_name, 
+    def _make_desktop_file(self, package_name,
                            screenshot_url='http://example.com',
                            desktop_file_version="1.0"):
         desktop_file = tempfile.mktemp()
@@ -476,14 +476,14 @@
         """When processing a desktop file, handle if screenshot_url is set."""
         command = import_app_install_data.Command()
         desktop_file = self._make_desktop_file(
-                'foo', screenshot_url='http://foo.com')
+            'foo', screenshot_url='http://foo.com')
 
         distroseries = self.factory.make_distroseries()
         command.process_desktop_file(desktop_file, '', distroseries)
         # no breakage!
 
     def test_process_desktop_file_doesnt_override_version(self):
-        distroseries=self.factory.make_distroseries(code_name='natty')
+        distroseries = self.factory.make_distroseries(code_name='natty')
         app = self.factory.make_application(
             package_name='inkscape', version="1.6.3a123",
             distroseries=distroseries)
@@ -1037,8 +1037,8 @@
 
 
 class ImportAllAppInstallDataTestCase(TestCaseWithFactory):
-
-    def test_handle(self):
+    @patch('sys.stdout')
+    def test_handle(self, mock_stdout):
         patch_attr = ('webcatalog.management.commands.'
                       'import_all_app_install_data.call_command')
         with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):
@@ -1049,8 +1049,8 @@
 
 
 class ImportAllRatingsStatsTestCase(TestCaseWithFactory):
-
-    def test_handle(self):
+    @patch('sys.stdout')
+    def test_handle(self, mock_stdout):
         patch_attr = ('webcatalog.management.commands.'
                       'import_all_ratings_stats.call_command')
         with patch_settings(UBUNTU_SERIES_FOR_VERSIONS=TEST_VERSIONS):

=== modified file 'src/webcatalog/tests/test_preflight.py'
--- src/webcatalog/tests/test_preflight.py	2012-06-06 18:00:26 +0000
+++ src/webcatalog/tests/test_preflight.py	2012-06-21 20:36:21 +0000
@@ -40,13 +40,12 @@
             user.save()
         self.client.login(username='test', password='test')
 
-    def test_public_url_redirects_to_login(self):
-        response = self.client.get('/+preflight', follow=True)
-
-        with patch_settings(PREFLIGHT_GROUPS=['preflight']):
-            self.assertContains(response, 'OpenID transaction in progress')
-
-    def test_login_needed_for_preflight(self):
+    @patch('webcatalog.utilities.WebServices.identity_provider')
+    @patch('webcatalog.utilities.WebServices.get_screenshots_for_package')
+    @patch('webcatalog.utilities.WebServices.recommender_api')
+    @patch('webcatalog.utilities.WebServices.rnr_api')
+    def test_login_needed_for_preflight(self, mock_rnr, mock_recommender,
+                                        mock_screenshots, mock_sso):
         self.login()
 
         with patch_settings(PREFLIGHT_GROUPS=['preflight']):