Merge lp:~cjwatson/launchpad/product-factory-projectgroup into lp:launchpad

[Colin Watson]

Revert premature uses of Product.projectgroup.

I didn't quite pick apart my megabranch correctly, and the previous merge included a couple of premature uses of Product.projectgroup.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/registry/browser/tests/test_subscription_links.py'
--- lib/lp/registry/browser/tests/test_subscription_links.py	2015-01-29 14:14:01 +0000
+++ lib/lp/registry/browser/tests/test_subscription_links.py	2015-01-29 15:36:05 +0000
@@ -453,7 +453,7 @@
         # parent has a bugtracker (see bug 770287).
         projectgroup = self.factory.makeProject()
         with person_logged_in(self.target.owner):
-            self.target.projectgroup = projectgroup
+            self.target.project = projectgroup
         self.factory.makeProduct(
             projectgroup=projectgroup, official_malone=True)
         self._create_scenario(self.regular_user)

=== modified file 'lib/lp/registry/tests/test_projectgroup.py'
--- lib/lp/registry/tests/test_projectgroup.py	2015-01-29 14:14:01 +0000
+++ lib/lp/registry/tests/test_projectgroup.py	2015-01-29 15:36:05 +0000
@@ -111,7 +111,7 @@
             name="zazzle-product",
             title="Hoozah",
             owner=self.person)
-        product.projectgroup = self.projectgroup1
+        product.project = self.projectgroup1
         results = self.projectgroupset.search(
             text="Hoozah", search_products=False)
         self.assertEqual(0, results.count())
@@ -123,7 +123,7 @@
             name="zazzle-product",
             title="Hoozah",
             owner=self.person)
-        product.projectgroup = self.projectgroup1
+        product.project = self.projectgroup1
         results = self.projectgroupset.search(
             text="Hoozah", search_products=True)
         self.assertEqual(1, results.count())