Merge lp:~james-w/pkgme-service/drop-name-check into lp:pkgme-service

[James Westby]

Drop the check that the package name matches myapps.

It's not longer possible for the developer to specify the
package name outside the package, so the check would never
fail.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~james-w/pkgme-service/drop-name-check into lp:pkgme-service failed. Below is the output from the failed tests.

python django_project/manage.py test djpkgme
Creating test database for alias 'default'...
Destroying test database for alias 'default'...
Running pkgme-service tests in tarmac
[ -d ../download-cache ] && (cd ../download-cache && bzr pull) || (bzr branch lp:~ubuntuone-pqm-team/pkgme-service/download-cache ../download-cache)
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/pkgme-service/download-cache/
No revisions or tags to pull.
Pulling config-manager
bzr branch lp:~ubuntuone-pqm-team/config-manager/stable branches/config-manager
[ -d ../download-cache ] && (cd ../download-cache && bzr pull) || (bzr branch lp:~ubuntuone-pqm-team/pkgme-service/download-cache ../download-cache)
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~ubuntuone-pqm-team/pkgme-service/download-cache/
No revisions or tags to pull.
make install-wheels
make[1]: Entering directory `/mnt/tarmac/cache/pkgme-service/trunk'
pip install --find-links=file://`pwd`/../download-cache/dist --no-index --no-deps -U pip
Ignoring indexes: https://pypi.python.org/simple/
Requirement already up-to-date: pip in ./env/lib/python2.7/site-packages
Cleaning up...
pip install --find-links=../download-cache/wheels --no-index --no-deps -U setuptools
Ignoring indexes: https://pypi.python.org/simple/
Unpacking /mnt/tarmac/cache/pkgme-service/download-cache/wheels/setuptools-3.4.4-py2.py3-none-any.whl
Installing collected packages: setuptools
  Found existing installation: setuptools 2.2
    Uninstalling setuptools:
      Successfully uninstalled setuptools
Successfully installed setuptools
Cleaning up...
pip install --find-links=../download-cache/wheels --no-index --no-deps --egg twisted txstatsd treeshape
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking twisted
Downloading/unpacking txstatsd
Downloading/unpacking treeshape
Installing collected packages: twisted, txstatsd, treeshape
Successfully installed twisted txstatsd treeshape
Cleaning up...
pip install --find-links=../download-cache/wheels --no-index --no-deps -r requirements/dev.txt
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking amqplib==1.0.2 (from -r requirements/prod.txt (line 1))
Downloading/unpacking anyjson==0.3.3 (from -r requirements/prod.txt (line 2))
Downloading/unpacking bson==0.3.3 (from -r requirements/prod.txt (line 3))
Downloading/unpacking bzr==2.5.1 (from -r requirements/prod.txt (line 4))
Downloading/unpacking celery==2.5.0 (from -r requirements/prod.txt (line 5))
Downloading/unpacking Cheetah==2.4.4 (from -r requirements/prod.txt (line 6))
Downloading/unpacking configglue==1.0.1 (from -r requirements/prod.txt (line 7))
Downloading/unpacking django==1.4.14 (from -r requirements/prod.txt (line 8))
Downloading/unpacking django-celery==2.5.0 (from -r requirements/prod.txt (line 9))
Downloading/unpacking django-configglue==0.7.1 (from -r requirements/prod.txt (line 10))
Downloading/unpacking django-openid-auth==0.4 (from -r requirements/prod.txt (line 11))
Downloading/unpacking django-picklefield==0.2.1 ...

[lp:~james-w/pkgme-service/drop-name-check]

221. By James Westby on 2015-04-15

Fix the integration test.

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2015-03-18 21:05:49 +0000
+++ src/djpkgme/tasks.py	2015-04-15 19:54:41 +0000
@@ -489,7 +489,6 @@
         results = []
         if not (unpack_result['error'] or unpack_result['warn']):
             results.extend([
-                self.check_package_name_matches(metadata, unpacked),
                 self.check_package_version_matches(metadata, unpacked),
             ])
             return results
@@ -500,22 +499,6 @@
 
         return results
 
-    def check_package_name_matches(self, metadata, package):
-        status = text = None
-
-        manifest = self.get_package_manifest(package)
-        if manifest['name'] != metadata['package_fullname']:
-            status = 'error'
-            text = '''Package name in the manifest: `{}`
-
-Package name in My Apps: `{}`
-'''.format(manifest['name'], metadata['package_fullname'])
-
-        check_result = make_check_result(
-            'Stated package name matches the manifest',
-            status=status, text=text)
-        return check_result
-
     def check_package_version_matches(self, metadata, package):
         status = text = None
 

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2015-03-18 21:05:49 +0000
+++ src/djpkgme/tests/test_tasks.py	2015-04-15 19:54:41 +0000
@@ -1177,34 +1177,6 @@
         p.start()
         self.addCleanup(p.stop)
 
-    def test_check_package_name_matches(self):
-        job = ClickPackageReviewJob()
-        package_name = 'some.package'
-        metadata = dict(package_fullname=package_name)
-        tempdir = self.useFixture(TempDir()).path
-        self.make_manifest_file(dict(name=package_name), tempdir)
-        result = job.check_package_name_matches(metadata, tempdir)
-        expected_result = make_check_result(
-            'Stated package name matches the manifest')
-        self.assertEqual(result, expected_result)
-
-    def test_check_package_name_doesnt_match(self):
-        job = ClickPackageReviewJob()
-        package_name = 'some.package'
-        other_package_name = 'some.other.package'
-        metadata = dict(package_fullname=package_name)
-        tempdir = self.useFixture(TempDir()).path
-        self.make_manifest_file(dict(name=other_package_name), tempdir)
-        result = job.check_package_name_matches(metadata, tempdir)
-        explanation = '''Package name in the manifest: `{}`
-
-Package name in My Apps: `{}`
-'''.format(other_package_name, package_name)
-        expected_result = make_check_result(
-            'Stated package name matches the manifest',
-            status='error', text=explanation)
-        self.assertEqual(result, expected_result)
-
     def test_check_package_version_matches(self):
         job = ClickPackageReviewJob()
         version = '1.0'
@@ -1447,13 +1419,12 @@
             cmd = [script_path, downloaded_path, '{"framework": {}}']
             mock_call.assert_any_call(cmd, stderr=subprocess.STDOUT)
         self.assertEqual(3, len(results.keys()))
-        # there should be 5 successful checks:
+        # there should be 4 successful checks:
         # - valid click package
-        # - package name matches manifest
         # - package version matches manifest
         # - 1 click reviewers tools script (faked in test)
         # - check click-reviewers-tools revno
-        self.assertEqual(5, len(results['info']))
+        self.assertEqual(4, len(results['info']))
         # there should be no errors
         self.assertEqual(0, len(results['warn']))
         self.assertEqual(0, len(results['error']))