Merge lp:~rvb/launchpad/bug-803482 into lp:launchpad

[Raphaël Badin]

[r=allenap][bug=803482] Remove duplicates from DistroSeriesDerivationVocabulary.

This branches fixes the DistroSeriesDerivationVocabulary to remove duplicates in it.

= Test =

./bin/test -cvv test_distroseries_vocabularies test_no_duplicates

= Q/A =

- Go to: https://dogfood.launchpad.net/demodist/demoseries/+initseries;
- Click add a parent a look for "Natt";
- Only one instance of Natty should show up.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/registry/tests/test_distroseries_vocabularies.py'
--- lib/lp/registry/tests/test_distroseries_vocabularies.py	2011-06-16 16:28:28 +0000
+++ lib/lp/registry/tests/test_distroseries_vocabularies.py	2011-06-29 15:06:14 +0000
@@ -226,3 +226,16 @@
         with StormStatementRecorder() as recorder:
             DistroSeriesDerivationVocabulary(distroseries).terms
             self.assertThat(recorder, HasQueryCount(Equals(2)))
+
+    def test_no_duplicates(self):
+        # No duplicates are present in the returned vocabulary.
+        distroseries = self.makeDistroSeriesWithDistroArch()
+        vocabulary = DistroSeriesDerivationVocabulary(distroseries)
+        expected_distroseries = (
+            set(self.all_series_with_arch).difference(
+                distroseries.distribution.series))
+        observed_distroseries = [term.value for term in vocabulary]
+
+        self.assertContentEqual(
+            expected_distroseries,
+            observed_distroseries)

=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2011-06-24 13:40:28 +0000
+++ lib/lp/registry/vocabularies.py	2011-06-29 15:06:14 +0000
@@ -1819,7 +1819,7 @@
             *where)
         query = query.order_by(
             Distribution.displayname,
-            Desc(DistroSeries.date_created))
+            Desc(DistroSeries.date_created)).config(distinct=True)
         return [series for (series, distribution) in query]
 
     def searchParents(self, query=None):
@@ -1962,7 +1962,7 @@
         # package names are always lowercase.
         return super(SourcePackageNameVocabulary, self).getTermByToken(
             token.lower())
-        
+ 
 
 class DistributionSourcePackageVocabulary: