← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~lifeless/launchpad/soyuz into lp:launchpad

 

Robert Collins has proposed merging lp:~lifeless/launchpad/soyuz into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


Minor testing tweak done while I was getting orientated to look at +packages. Very much not RC.
-- 
https://code.launchpad.net/~lifeless/launchpad/soyuz/+merge/32296
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lifeless/launchpad/soyuz into lp:launchpad.
=== modified file 'lib/lp/soyuz/browser/tests/test_archive_packages.py'
--- lib/lp/soyuz/browser/tests/test_archive_packages.py	2010-07-20 12:06:36 +0000
+++ lib/lp/soyuz/browser/tests/test_archive_packages.py	2010-08-11 08:08:17 +0000
@@ -82,15 +82,13 @@
 
 
 class TestPPAPackages(TestCaseWithFactory):
+
     layer = LaunchpadFunctionalLayer
 
-    def setUp(self):
-        super(TestPPAPackages, self).setUp()
-        self.joe = self.factory.makePerson(name='joe')
-        self.ppa = self.factory.makeArchive()
-
-    def test_ppa_packages(self):
-        login_person(self.joe)
-        view = create_initialized_view(self.ppa, "+index")
+    def test_ppa_packages_menu_is_enabled(self):
+        joe = self.factory.makePerson()
+        ppa = self.factory.makeArchive()
+        login_person(joe)
+        view = create_initialized_view(ppa, "+index")
         menu = ArchiveNavigationMenu(view)
         self.assertTrue(menu.packages().enabled)

=== modified file 'lib/lp/testing/sampledata.py'
--- lib/lp/testing/sampledata.py	2010-08-05 02:29:25 +0000
+++ lib/lp/testing/sampledata.py	2010-08-11 08:08:17 +0000
@@ -14,6 +14,7 @@
     'COMMERCIAL_ADMIN_EMAIL',
     'HOARY_DISTROSERIES_NAME',
     'I386_ARCHITECTURE_NAME',
+    'LAUNCHPAD_ADMIN',
     'LAUNCHPAD_DBUSER_NAME',
     'MAIN_COMPONENT_NAME',
     'NO_PRIVILEGE_EMAIL',
@@ -38,6 +39,7 @@
 CHROOT_LIBRARYFILEALIAS = 1
 HOARY_DISTROSERIES_NAME = 'hoary'
 I386_ARCHITECTURE_NAME = 'i386'
+LAUNCHPAD_ADMIN = 'admin@xxxxxxxxxxxxx'
 LAUNCHPAD_DBUSER_NAME = 'launchpad'
 MAIN_COMPONENT_NAME = 'main'
 NO_PRIVILEGE_EMAIL = 'no-priv@xxxxxxxxxxxxx'