Merge lp:~abentley/launchpad/fix-592319 into lp:launchpad

[Aaron Bentley]

Use a random starting integer instead of a UUID.

= Summary =
Fix bug #592319: test_match_exact_branch_name fails spuriously

== Proposed fix ==
Append an integer, rather than a UUID, to the base of generic strings. This
allows us to retain our assertions that generic strings do not contain specific
non-numeric strings. However, while the integer will increment normally,
the starting point of the integer is random, so that multiple runs can be done
against the same database without conflicts.

== Pre-implementation notes ==
Discussed parameters of a solution with BjornT

== Implementation details ==
Used thread-local storage so that this approach is thread-safe. Each thread
will use its own random starting point.

Used a range between 0 and 1,000,000 for the starting point, because using
maxint/2 exceeded maximum database values.

== Tests ==
bin/test -v

== Demo and Q/A ==
None. This is a fix for a transient failure, so you can never be sure that it
*would* have failed.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/testing/factory.py

[Māris Fogels (mars)]

Hi Aaron,

This looks good. Brilliant use of Python builtins. r=mars

Maris

review: Approve

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-05-19 15:39:52 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-06-15 13:34:40 +0000
@@ -239,7 +239,7 @@
         ubuntu_test = breezy_autotest.distribution
         self.series = [breezy_autotest]
         self.series.append(self.factory.makeDistroRelease(
-            distribution=ubuntu_test, name="foo-series"))
+            distribution=ubuntu_test, name="foo-series", version='1.0'))
 
         self.sources = []
         gedit_src_hist = self.publisher.getPubSource(

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-06-13 05:56:31 +0000
+++ lib/lp/testing/factory.py	2010-06-15 13:34:40 +0000
@@ -22,8 +22,10 @@
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from itertools import count
+import os.path
+from random import randint
 from StringIO import StringIO
-import os.path
+from threading import local
 
 import pytz
 
@@ -56,7 +58,6 @@
 from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
-from canonical.uuid import generate_uuid
 
 from lp.blueprints.interfaces.specification import (
     ISpecificationSet, SpecificationDefinitionStatus)
@@ -213,14 +214,22 @@
 
     def __init__(self):
         # Initialise the unique identifier.
-        self._integer = count(1)
+        self._local = local()
 
     def getUniqueEmailAddress(self):
         return "[e-mail]" % self.getUniqueString('email')
 
     def getUniqueInteger(self):
-        """Return an integer unique to this factory instance."""
-        return self._integer.next()
+        """Return an integer unique to this factory instance.
+
+        For each thread, this will be a series of increasing numbers, but the
+        starting point will be unique per thread.
+        """
+        counter = getattr(self._local, 'integer', None)
+        if counter is None:
+            counter = count(randint(0, 1000000))
+            self._local.integer = counter
+        return counter.next()
 
     def getUniqueHexString(self, digits=None):
         """Return a unique hexadecimal string.
@@ -245,7 +254,7 @@
         """
         if prefix is None:
             prefix = "generic-string"
-        string = "%s%s" % (prefix, generate_uuid())
+        string = "%s%s" % (prefix, self.getUniqueInteger())
         return string.replace('_', '-').lower()
 
     def getUniqueUnicode(self):