launchpad-reviewers team mailing list archive

[Colin Watson <mp+435674@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:test-dspr-files-proxy into launchpad:master.

Commit message:
Stop removing security proxy in TestDistroSourcePackageReleaseFiles

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #608240 in Launchpad itself: "TestDistroSourcePackageReleaseFiles requires unproxied distroseries objects"
  https://bugs.launchpad.net/launchpad/+bug/608240

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/435674

Something must have been fixed in the meantime, since the test now just works without removing the security proxy.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:test-dspr-files-proxy into launchpad:master.

diff --git a/lib/lp/soyuz/browser/tests/test_distrosourcepackagerelease.py b/lib/lp/soyuz/browser/tests/test_distrosourcepackagerelease.py
index 62711ee..e6fd408 100644
--- a/lib/lp/soyuz/browser/tests/test_distrosourcepackagerelease.py
+++ b/lib/lp/soyuz/browser/tests/test_distrosourcepackagerelease.py
@@ -10,7 +10,6 @@ from lp.soyuz.model.distributionsourcepackagerelease import (
 )
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
-from lp.testing.factory import remove_security_proxy_and_shout_at_engineer
 from lp.testing.layers import LaunchpadFunctionalLayer
 from lp.testing.views import create_initialized_view
 
@@ -25,16 +24,9 @@ class TestDistroSourcePackageReleaseFiles(TestCaseWithFactory):
         # The package must be published for the page to render.
         stp = SoyuzTestPublisher()
         distroseries = stp.setUpDefaultDistroSeries()
-        naked_distroseries = remove_security_proxy_and_shout_at_engineer(
-            distroseries
-        )
-        # XXX Abel Deuring, 2010-07-21, bug 608240. This is scary. But
-        # if we use distroseries.distribution instead,
-        # test_spr_files_deleted() and test_spr_files_one() fail.
-        distro = naked_distroseries.distribution
         source_package_release = stp.getPubSource().sourcepackagerelease
         self.dspr = DistributionSourcePackageRelease(
-            distro, source_package_release
+            distroseries.distribution, source_package_release
         )
         self.library_file = self.factory.makeLibraryFileAlias(
             filename="test_file.dsc", content="0123456789"