Merge lp:~michael.nelson/ubuntu-webcatalog/993813-cannot-import-for-purchase-with-archive-id-none into lp:ubuntu-webcatalog

[Michael Nelson]

Add Application.application_id so we have a unique ref for apps, now that archive_id is nullable (for arb apps) in the sca api.

Overview
========

Updates the ForPurchaseApplicationForm so that, when interpreting API available apps from sca, it does not barf on archive_id=null, but instead tries to grab an application using the application_id instead.

I've also moved a bunch of tests for extras that were in the ImportForPurchaseAppsTestCase, but are really for ImportAppInstallTestCase.

Initially, I thought arb apps should be saved with archive_id=None, but as Application.archive_id is a simple CharField in this app, the default empty value is ''. We could also pull in our custom ArchiveId field and update the default empty value to None - see what you think.

`fab test`

[lp:~michael.nelson/ubuntu-webcatalog/993813-cannot-import-for-purchase-with-archive-id-none]

120. By Michael Nelson on 2012-05-03

Merged trunk and resolved conflicts.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

LGTM

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-05-03 12:39:31 +0000
+++ src/webcatalog/forms.py	2012-05-03 13:10:29 +0000
@@ -144,10 +144,21 @@
         if 'debtags' in  app_data and app_data['debtags']:
             app_data['debtags'] = json.dumps([get_hw_short_description(x)
                                    for x in app_data['debtags']])
+        app_data['application_id'] = app_data.get('id')
+
         try:
-            instance = Application.objects.get(
-                archive_id=app_data.get('archive_id'),
-                distroseries=distroseries)
+            # XXX 2012-05-03 michaeln bug=993813 We can update to use
+            # application_id only below once an import runs on production
+            # setting the application_ids.
+            archive_id = app_data.get('archive_id')
+            if archive_id:
+                instance = Application.objects.get(
+                    archive_id=archive_id,
+                    distroseries=distroseries)
+            else:
+                instance = Application.objects.get(
+                    application_id=app_data['application_id'],
+                    distroseries=distroseries)
         except Application.DoesNotExist:
             instance = None
 
 
=== added file 'src/webcatalog/migrations/0021_add_archive_id.py'
--- src/webcatalog/migrations/0021_add_archive_id.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0021_add_archive_id.py	2012-05-03 13:10:29 +0000
@@ -0,0 +1,166 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Application.application_id'
+        db.add_column('webcatalog_application', 'application_id', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Application.application_id'
+        db.delete_column('webcatalog_application', 'application_id')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'application_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'debtags': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_latest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '2', 'blank': 'True'}),
+            'ratings_histogram': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
+            'wilson_score': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.applicationmedia': {
+            'Meta': {'unique_together': "(('application', 'url'),)", 'object_name': 'ApplicationMedia'},
+            'application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Application']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'webcatalog.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'MbyfjpwvpAZhZPLmGbEXCNhSGMCWCv'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        },
+        'webcatalog.exhibit': {
+            'Meta': {'object_name': 'Exhibit'},
+            'banner_url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.DistroSeries']", 'symmetrical': 'False'}),
+            'html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_names': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sca_id': ('django.db.models.fields.IntegerField', [], {}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'webcatalog.machine': {
+            'Meta': {'unique_together': "(('owner', 'uuid'),)", 'object_name': 'Machine'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'package_list': ('django.db.models.fields.TextField', [], {}),
+            'packages_checksum': ('django.db.models.fields.CharField', [], {'max_length': '56'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'})
+        },
+        'webcatalog.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Token']"})
+        },
+        'webcatalog.reviewstatsimport': {
+            'Meta': {'object_name': 'ReviewStatsImport'},
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']", 'unique': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_import': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        'webcatalog.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'afduSDFNmldZMjYZFoBLOhXEULKLrbmDGPKtuoHEUVLCyheFhY'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'obbeyYIEgkoxRBtOlkaXbtfgOGnkWUVIppSANzntzFEMuOytlC'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']
 
=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-04-13 20:45:03 +0000
+++ src/webcatalog/models/applications.py	2012-05-03 13:10:29 +0000
@@ -89,6 +89,7 @@
          db_index=True, blank=True)
     price = models.DecimalField(max_digits=7, decimal_places=2, null=True,
         blank=True, help_text="For-purchase applications (in US Dollars).")
+    application_id = models.IntegerField(null=True, blank=True)
 
     ratings_total = models.IntegerField(null=True, blank=True)
     ratings_average = models.DecimalField(max_digits=3, decimal_places=2,
 
=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-04-17 17:09:03 +0000
+++ src/webcatalog/tests/factory.py	2012-05-03 13:10:29 +0000
@@ -101,7 +101,7 @@
         distroseries=None, arch='i686', ratings_average=None,
         ratings_total=None, ratings_histogram='', screenshot_url='',
         archive_id=None, version='', is_latest=False, wilson_score=0.0,
-        debtags=[]):
+        debtags=[], application_id=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -120,7 +120,8 @@
             ratings_average=ratings_average, ratings_total=ratings_total,
             ratings_histogram=ratings_histogram,
             archive_id=archive_id, version=version, is_latest=is_latest,
-            wilson_score=wilson_score, debtags=debtags)
+            wilson_score=wilson_score, debtags=debtags,
+            application_id=application_id)
 
         if screenshot_url:
             ApplicationMedia.objects.create(
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-04-20 16:57:50 +0000
+++ src/webcatalog/tests/test_commands.py	2012-05-03 13:10:29 +0000
@@ -433,26 +433,86 @@
         command.process_desktop_file(desktop_file, '', distroseries)
         # no breakage!
 
+    @patch('urllib.urlopen')
+    def test_fetch_icon_from_extras(self, mock_urlopen):
+        mock_urlopen.return_value.getcode.return_value = 200
+        mock_urlopen.return_value.read.return_value = "I'm a png!"
+        app = self.factory.make_application()
+        candidate = Mock()
+        candidate.uri = 'http://extras.ubuntu.com/pool/f/foobar.deb'
+        candidate.record = {'Icon': 'foo.png'}
+        command = import_app_install_data.Command()
+
+        command.fetch_icon_from_extras(app, candidate)
+
+        self.assertEqual("I'm a png!", app.icon.read())
+        self.assertEqual(1, mock_urlopen.call_count)
+        mock_urlopen.assert_called_with(
+            'http://extras.ubuntu.com/meta/foo.png')
+
+    @patch('urllib.urlopen')
+    def test_fetches_nothing_if_no_icon(self, mock_urlopen):
+        app = self.factory.make_application()
+        candidate = Mock()
+        candidate.uri = 'http://extras.ubuntu.com/pool/f/foobar.deb'
+        candidate.record = {}
+        command = import_app_install_data.Command()
+
+        command.fetch_icon_from_extras(app, candidate)
+
+        self.assertEqual(0, mock_urlopen.call_count)
+        self.assertFalse(app.icon)
+
+    @patch('urllib.urlopen')
+    def test_fetches_nothing_if_not_in_extras(self, mock_urlopen):
+        app = self.factory.make_application()
+        candidate = Mock()
+        candidate.uri = 'http://archive.ubuntu.com/pool/f/foobar.deb'
+        candidate.record = {'Icon': 'foobar.png'}
+        command = import_app_install_data.Command()
+
+        command.fetch_icon_from_extras(app, candidate)
+
+        self.assertEqual(0, mock_urlopen.call_count)
+        self.assertFalse(app.icon)
+
 
 class ImportForPurchaseAppsTestCase(TestCaseWithFactory):
 
     def setUp(self):
         super(ImportForPurchaseAppsTestCase, self).setUp()
-        curdir = os.path.dirname(__file__)
-        sca_apps_file = os.path.join(curdir, 'test_data', 'sca_apps.txt')
         self.natty = self.factory.make_distroseries(
             code_name='natty', version='11.04')
         self.maverick = self.factory.make_distroseries(
             code_name='maverick', version='10.10')
-        with open(sca_apps_file) as content:
-            self.response_content = content.read()
-        mock_response = Mock()
-        mock_response.code = 200
-        mock_response.read.return_value = self.response_content
 
         self.patch_urlopen = patch('urllib.urlopen')
-        mock_urllib = self.patch_urlopen.start()
-        mock_urllib.return_value = mock_response
+        self.mock_urlopen = self.patch_urlopen.start()
+
+        def mock_urlopen_fn(url):
+            """Return predetermined test_data content for given urls."""
+            available_apps_url = '%sapplications/any/ubuntu/any/any/' % (
+                    settings.SCA_API_URL)
+            icon_arb_url = ('http://sc.staging.ubuntu.com/'
+                        'site_media/appmedia/2012/04/ktip.png')
+            icon_hello_url = ('http://localhost:8000/'
+                          'site_media/icons/2011/06/eg_64x64.png')
+            filenames = {
+                available_apps_url: 'sca_apps.txt',
+                icon_arb_url: 'ubuntu-cof.png',
+                icon_hello_url: 'ubuntu-cof.png',
+                }
+            curdir = os.path.dirname(__file__)
+            sca_apps_file = os.path.join(curdir, 'test_data',
+                    filenames[url])
+            with open(sca_apps_file) as content:
+                self.response_content = content.read()
+            mock_response = Mock()
+            mock_response.code = 200
+            mock_response.read.return_value = self.response_content
+            return mock_response
+
+        self.mock_urlopen.side_effect = mock_urlopen_fn
         self.addCleanup(self.patch_urlopen.stop)
 
     def test_app_for_purchase_is_found(self):
@@ -486,21 +546,30 @@
         self.factory.make_application(archive_id='launchpad_zematynnad2/myppa',
             package_name='somethingelse',
             distroseries=self.natty)
-        self.assertEqual(2, Application.objects.count())
+        self.assertEqual(2,
+            Application.objects.filter(
+                distroseries__in=(self.natty, self.maverick)).count())
 
         call_command('import_for_purchase_apps')
 
-        self.assertEqual(2, Application.objects.count())
-        for app in Application.objects.all():
+        actual_apps = Application.objects.filter(
+                distroseries__in=(self.natty, self.maverick))
+        self.assertEqual(2, actual_apps.count())
+        for app in actual_apps:
             self.assertEqual('launchpad_zematynnad2/myppa', app.archive_id)
             self.assertEqual('hello', app.package_name)
 
     def test_app_gets_icon(self):
         call_command('import_for_purchase_apps')
 
+        self.mock_urlopen.assert_called_with(
+            'http://sc.staging.ubuntu.com/'
+            'site_media/appmedia/2012/04/ktip.png')
         app = Application.objects.get(name='MyApp',
             distroseries=self.natty)
-        self.assertEqual(6461, app.icon.size)
+        # The urlopen double returns the test_data/ubuntu-cof.png which has
+        # a size of 2438.
+        self.assertEqual(2438, app.icon.size)
 
     def test_app_gets_version(self):
         call_command('import_for_purchase_apps')
@@ -524,48 +593,23 @@
         qs = app.applicationmedia_set.filter(media_type='screenshot')
         self.assertEqual(2, qs.count())
 
-    @patch('urllib.urlopen')
-    def test_fetch_icon_from_extras(self, mock_urlopen):
-        mock_urlopen.return_value.getcode.return_value = 200
-        mock_urlopen.return_value.read.return_value = "I'm a png!"
-        app = self.factory.make_application()
-        candidate = Mock()
-        candidate.uri = 'http://extras.ubuntu.com/pool/f/foobar.deb'
-        candidate.record = {'Icon': 'foo.png'}
-        command = import_app_install_data.Command()
-
-        command.fetch_icon_from_extras(app, candidate)
-
-        self.assertEqual("I'm a png!", app.icon.read())
-        self.assertEqual(1, mock_urlopen.call_count)
-        mock_urlopen.assert_called_with(
-            'http://extras.ubuntu.com/meta/foo.png')
-
-    @patch('urllib.urlopen')
-    def test_fetches_nothing_if_no_icon(self, mock_urlopen):
-        app = self.factory.make_application()
-        candidate = Mock()
-        candidate.uri = 'http://extras.ubuntu.com/pool/f/foobar.deb'
-        candidate.record = {}
-        command = import_app_install_data.Command()
-
-        command.fetch_icon_from_extras(app, candidate)
-
-        self.assertEqual(0, mock_urlopen.call_count)
-        self.assertFalse(app.icon)
-
-    @patch('urllib.urlopen')
-    def test_fetches_nothing_if_not_in_extras(self, mock_urlopen):
-        app = self.factory.make_application()
-        candidate = Mock()
-        candidate.uri = 'http://archive.ubuntu.com/pool/f/foobar.deb'
-        candidate.record = {'Icon': 'foobar.png'}
-        command = import_app_install_data.Command()
-
-        command.fetch_icon_from_extras(app, candidate)
-
-        self.assertEqual(0, mock_urlopen.call_count)
-        self.assertFalse(app.icon)
+    def test_import_arb_app(self):
+        call_command('import_for_purchase_apps')
+
+        arb_apps = Application.objects.filter(package_name='eg_arb_app')
+        self.assertEqual(2, arb_apps.count())
+        self.assertEqual('', arb_apps[0].archive_id)
+        self.assertEqual('', arb_apps[1].archive_id)
+
+    def test_import_arb_app_handle_existing_none_archive_id(self):
+        precise = self.factory.make_distroseries(code_name='precise')
+        self.factory.make_application(archive_id=None, distroseries=precise)
+        self.factory.make_application(archive_id=None, distroseries=precise)
+
+        call_command('import_for_purchase_apps')
+
+        arb_apps = Application.objects.filter(package_name='eg_arb_app')
+        self.assertEqual(2, arb_apps.count())
 
 
 class ImportRatingsTestCase(TestCaseWithFactory):
 
=== modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
--- src/webcatalog/tests/test_data/sca_apps.txt	2012-03-19 13:39:16 +0000
+++ src/webcatalog/tests/test_data/sca_apps.txt	2012-05-03 13:10:29 +0000
@@ -1,5 +1,6 @@
 [
     {
+        "id": 18,
         "status": "Published",
         "signing_key_id": "",
         "description": "MyAppTagline\nThe classic greeting, and a good example\r\n The GNU hello program produces a familiar, friendly greeting.  It\r\n allows non-programmers to use a classic computer science tool which\r\n would otherwise be unavailable to them.\r\n .\r\n Seriously, though: this is an example of how to do a Debian package.\r\n It is the Debian version of the GNU Project's `hello world' program\r\n (which is itself an example for the GNU Project).",
@@ -8,7 +9,6 @@
         "series": {"maverick": ["i386", "amd64"], "natty": ["i386", "amd64"]},
         "price": "2.50",
         "archive_id": "launchpad_zematynnad2/myppa",
-        "icon_data": "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",
         "screenshot_url": "",
         "screenshot_urls": [
                 "http://localhost:8000/screenshot_1.png",
@@ -19,5 +19,47 @@
         "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64.png",
         "categories": "Audio",
         "name": "MyApp"
+    },
+    {
+        "package_name": "eg_arb_app",
+        "video_embedded_html_urls": [],
+        "series": {
+            "precise": [
+                "amd64",
+                "i386"
+            ],
+            "oneiric": [
+                "i386",
+                "amd64"
+            ]
+        },
+        "video_urls": [],
+        "screenshot_url": "http://sc.staging.ubuntu.com/site_media/appmedia/2012/04/IMG_20120401_144332.jpg",
+        "id": 595,
+        "archive_id": null,
+        "support_url": "http://example.com/foo",
+        "icon_url": "http://sc.staging.ubuntu.com/site_media/appmedia/2012/04/ktip.png",
+        "version": "1.2",
+        "demo": null,
+        "department": [
+            "Accessories"
+        ],
+        "tos_url": "",
+        "channel": "Independent",
+        "status": "Published",
+        "signing_key_id": "",
+        "description": "This is a test about ARB apps\nThis is a description.  My test application will provide magic and wonder to kids of all ages.",
+        "price": "0.00",
+        "debtags": [
+            "hardware::input:mouse"
+        ],
+        "date_published": "2012-04-30 19:34:08.011454",
+        "categories": "Utility",
+        "name": "ARB test",
+        "license": "GNU GPL v3",
+        "screenshot_urls": [
+            "http://sc.staging.ubuntu.com/site_media/appmedia/2012/04/IMG_20120401_144332.jpg"
+        ],
+        "archive_root": "http://extras.ubuntu.com/"
     }
 ]
 
=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-05-02 15:18:48 +0000
+++ src/webcatalog/tests/test_forms.py	2012-05-03 13:10:29 +0000
@@ -203,6 +203,7 @@
             app.distroseries)
         self.assertTrue(form.is_valid())
         form.save_media_urls()
+
         self.assertEqual(3, app.applicationmedia_set.count())
         actual_urls = [media.url for media in app.applicationmedia_set.all()]
         self.assertEqual([
@@ -211,6 +212,69 @@
             'http://example.com/video1.mp4',
             ], actual_urls)
 
+    def make_valid_data(self, **kwargs):
+        data = {
+            u'status': u'Published',
+            u'signing_key_id': u'',
+            u'description': u'This is a description.',
+            u'package_name': self.factory.get_unique_string(prefix='pkg'),
+            u'video_embedded_html_urls': [],
+            u'series': {
+                u'precise': [u'amd64', u'i386'],
+                u'oneiric': [u'i386', u'amd64']
+                },
+            u'price': u'0.00',
+            u'debtags': '["mouse"]',
+            u'date_published': u'2012-04-30 19:34:08.011454',
+            u'video_urls': [],
+            u'screenshot_url': u'http://sc.staging.ubuntu.com/'
+                                'site_media/appmedia/2012/04/'
+                                'IMG_20120401_144332.jpg',
+            u'id': 595,
+            u'categories': u'Utility',
+            u'archive_id': self.factory.get_unique_string(prefix='archid/'),
+            u'name': u'Test App',
+            u'license': u'GNU GPL v3',
+            u'support_url': u'http://example.com/foo',
+            u'icon_url': u'http://sc.staging.ubuntu.com/'
+                          'site_media/appmedia/2012/04/ktip.png',
+            u'comment': u'This is a test app',
+            u'version': u'1.2',
+            u'screenshot_urls': [
+                u'http://sc.staging.ubuntu.com/'
+                 'site_media/appmedia/2012/04/IMG_20120401_144332.jpg',
+                ],
+            u'demo': None,
+            u'department': [u'Accessories'],
+            u'archive_root': u'http://extras.ubuntu.com/',
+            u'tos_url': u'',
+            u'channel': u'Independent',
+            }
+        data.update(**kwargs)
+        return data
+
+    def test_archive_id_none_uses_application_id(self):
+        precise = self.factory.make_distroseries(code_name='precise')
+        existing_app = self.factory.make_application(
+            archive_id=None, application_id=21, distroseries=precise)
+
+        data = self.make_valid_data(archive_id=None, id=21)
+        form = ForPurchaseApplicationForm.from_api_data(data, precise)
+
+        self.assertEqual(existing_app, form.instance)
+
+    def test_updates_application_id(self):
+        precise = self.factory.make_distroseries(code_name='precise')
+        existing_app = self.factory.make_application(
+            archive_id='foo/bar', application_id=None, distroseries=precise)
+
+        data = self.make_valid_data(archive_id='foo/bar', id=21)
+        form = ForPurchaseApplicationForm.from_api_data(data, precise)
+        form.save()
+
+        app_reloaded = Application.objects.get(id=existing_app.id)
+        self.assertEqual(21, app_reloaded.application_id)
+
 
 class MultiURLFieldTestCase(TestCase):