Merge lp:~cjwatson/launchpad/testrunner-uuid into lp:launchpad

[Colin Watson]

Generate LP_TEST_INSTANCE based on a UUID as well as the process ID.

When running tests in parallel, it's possible (and in some setups quite probable) for various LXC containers to end up with the same process IDs for bin/test. To avoid problems caused by this, generate LP_TEST_INSTANCE based on a UUID (replacing "-" with "_" so that it can form part of a valid database name) as well as the process ID.

[William Grant (wgrant)]

I'd like to see the PID included before the UUID, so it's easy enough to go from test process to DB.

review: Approve (code)

=== modified file 'lib/lp/testing/layers.py'
--- lib/lp/testing/layers.py	2015-10-05 13:46:23 +0000
+++ lib/lp/testing/layers.py	2015-10-08 11:35:52 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Layers used by Launchpad tests.
@@ -70,6 +70,7 @@
     TestResult,
     )
 from urllib import urlopen
+import uuid
 
 from fixtures import (
     Fixture,
@@ -329,7 +330,8 @@
         # We can only do unique test allocation and parallelisation if
         # LP_PERSISTENT_TEST_SERVICES is off.
         if not BaseLayer.persist_test_services:
-            test_instance = str(os.getpid())
+            test_instance = '%d_%s' % (
+                os.getpid(), str(uuid.uuid1()).replace('-', '_'))
             os.environ['LP_TEST_INSTANCE'] = test_instance
             cls.fixture.addCleanup(os.environ.pop, 'LP_TEST_INSTANCE', '')
             # Kill any Memcached or Librarian left running from a previous

=== modified file 'lib/lp/testing/tests/test_layers_functional.py'
--- lib/lp/testing/tests/test_layers_functional.py	2013-06-21 01:55:44 +0000
+++ lib/lp/testing/tests/test_layers_functional.py	2015-10-08 11:35:52 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from __future__ import with_statement
@@ -17,6 +17,7 @@
 import signal
 import smtplib
 from urllib import urlopen
+import uuid
 
 from amqplib import client_0_8 as amqp
 from fixtures import (
@@ -113,9 +114,11 @@
     def test_allocates_LP_TEST_INSTANCE(self):
         self.useFixture(BaseLayerIsolator())
         with LayerFixture(BaseLayer):
-            self.assertEqual(
-                str(os.getpid()),
-                os.environ.get('LP_TEST_INSTANCE'))
+            pid, raw_uuid = os.environ['LP_TEST_INSTANCE'].split('_', 1)
+            self.assertEqual(str(os.getpid()), pid)
+            instance_uuid = uuid.UUID(raw_uuid.replace('_', '-'))
+            self.assertEqual(uuid.RFC_4122, instance_uuid.variant)
+            self.assertEqual(1, instance_uuid.version)
         self.assertEqual(None, os.environ.get('LP_TEST_INSTANCE'))
 
     def test_persist_test_services_disables_LP_TEST_INSTANCE(self):

=== modified file 'lib/lp/testing/tests/test_pgsql.py'
--- lib/lp/testing/tests/test_pgsql.py	2015-10-05 09:51:25 +0000
+++ lib/lp/testing/tests/test_pgsql.py	2015-10-08 11:35:52 +0000
@@ -1,7 +1,8 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 import os
+import uuid
 
 from fixtures import (
     EnvironmentVariableFixture,
@@ -36,7 +37,13 @@
         BaseLayer.setUp()
         self.addCleanup(BaseLayer.tearDown)
         fixture = PgTestSetup(dbname=PgTestSetup.dynamic)
-        expected_name = "%s_%d" % (PgTestSetup.dbname, os.getpid())
+        raw_uuid = os.environ['LP_TEST_INSTANCE'].split('_', 1)[1]
+        instance_uuid = uuid.UUID(raw_uuid.replace('_', '-'))
+        self.assertEqual(uuid.RFC_4122, instance_uuid.variant)
+        self.assertEqual(1, instance_uuid.version)
+        expected_name = "%s_%d_%s" % (
+            PgTestSetup.dbname, os.getpid(),
+            str(instance_uuid).replace('-', '_'))
         self.assertDBName(expected_name, fixture)
 
     def test_db_naming_without_LP_TEST_INSTANCE_is_static(self):