---

vkedia · garrettjonesgoogle · commit f9c213c0b05d · 2017-02-14T14:10:28.000-08:00
yaml --- r: 7835 b: refs/heads/tswast-patch-1 c: 6cc0615 h: refs/heads/master i: 7833: b5fa411 7831: 6b92803
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 5311bb39021f97722bd8a549ed703e4c3d9b7c66
+refs/heads/tswast-patch-1: 6cc0615aefe22fd2ed394b906ae4c9cfb77170af
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java b/branches/tswast-patch-1/google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -41,6 +42,7 @@ public class RemoteSpannerHelper {
   private final Spanner client;
   private final InstanceId instanceId;
   private static int dbSeq;
+  private static int dbPrefix = new Random().nextInt(Integer.MAX_VALUE);
   private final List<Database> dbs = new ArrayList<>();
 
   private RemoteSpannerHelper(SpannerOptions options, InstanceId instanceId, Spanner client) {
@@ -78,7 +80,7 @@ public Database createTestDatabase(String... statements) throws SpannerException
    * Returns a database id which is guaranteed to be unique within the context of this environment.
    */
   public String getUniqueDatabaseId() {
-    return String.format("testdb_%04d", dbSeq++);
+    return String.format("testdb_%d_%04d", dbPrefix, dbSeq++);
   }
 
   /**
