Ubuntu Pastebin

Paste from chuck at Fri, 31 Jul 2015 13:50:53 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
Description: Fix column uniqueness when running unit tests.
Author: Chuck Short <zulcss@ubuntu.com>
Upstream yes:
diff -Naurp trove-4.0.0.0b1.orig/trove/tests/unittests/instance/test_instance_models.py trove-4.0.0.0b1/trove/tests/unittests/instance/test_instance_models.py
--- trove-4.0.0.0b1.orig/trove/tests/unittests/instance/test_instance_models.py	2015-06-23 11:41:08.000000000 -0400
+++ trove-4.0.0.0b1/trove/tests/unittests/instance/test_instance_models.py	2015-07-31 08:28:35.783097369 -0400
@@ -116,13 +116,13 @@ class CreateInstanceTest(trove_testtools
         self.users = []
         self.datastore = datastore_models.DBDatastore.create(
             id=str(uuid.uuid4()),
-            name='mysql',
+            name='mysql' + str(uuid.uuid4()),
         )
         self.datastore_version = (
             datastore_models.DBDatastoreVersion.create(
                 id=str(uuid.uuid4()),
                 datastore_id=self.datastore.id,
-                name="5.5",
+                name="5.5" + str(uuid.uuid4()),
                 manager="mysql",
                 image_id="image_id",
                 packages="",
@@ -220,12 +220,12 @@ class TestReplication(trove_testtools.Te
 
         self.datastore = datastore_models.DBDatastore.create(
             id=str(uuid.uuid4()),
-            name='name',
+            name='name' + str(uuid.uuid4()),
             default_version_id=str(uuid.uuid4()))
 
         self.datastore_version = datastore_models.DBDatastoreVersion.create(
             id=self.datastore.default_version_id,
-            name='name',
+            name='name' + str(uuid.uuid4()),
             image_id=str(uuid.uuid4()),
             packages=str(uuid.uuid4()),
             datastore_id=self.datastore.id,
diff -Naurp trove-4.0.0.0b1.orig/trove/tests/unittests/instance/test_instance_status.py trove-4.0.0.0b1/trove/tests/unittests/instance/test_instance_status.py
--- trove-4.0.0.0b1.orig/trove/tests/unittests/instance/test_instance_status.py	2015-06-23 11:41:08.000000000 -0400
+++ trove-4.0.0.0b1/trove/tests/unittests/instance/test_instance_status.py	2015-07-31 08:28:35.783097369 -0400
@@ -49,13 +49,13 @@ class BaseInstanceStatusTestCase(trove_t
             ServiceStatuses.RUNNING)
         self.datastore = models.DBDatastore.create(
             id=str(uuid.uuid4()),
-            name='mysql',
+            name='mysql' + str(uuid.uuid4()),
             default_version_id=self.db_info.datastore_version_id
         )
         self.version = models.DBDatastoreVersion.create(
             id=self.db_info.datastore_version_id,
             datastore_id=self.datastore.id,
-            name='5.5',
+            name='5.5' + str(uuid.uuid4()),
             manager='mysql',
             image_id=str(uuid.uuid4()),
             active=1,
diff -Naurp trove-4.0.0.0b1.orig/trove/tests/unittests/mgmt/test_models.py trove-4.0.0.0b1/trove/tests/unittests/mgmt/test_models.py
--- trove-4.0.0.0b1.orig/trove/tests/unittests/mgmt/test_models.py	2015-06-23 11:41:08.000000000 -0400
+++ trove-4.0.0.0b1/trove/tests/unittests/mgmt/test_models.py	2015-07-31 08:28:35.787097401 -0400
@@ -48,13 +48,13 @@ class MockMgmtInstanceTest(trove_testtoo
         cls.version_id = str(uuid.uuid4())
         cls.datastore = datastore_models.DBDatastore.create(
             id=str(uuid.uuid4()),
-            name='mysql',
+            name='mysql' + str(uuid.uuid4()),
             default_version_id=cls.version_id
         )
         cls.version = datastore_models.DBDatastoreVersion.create(
             id=cls.version_id,
             datastore_id=cls.datastore.id,
-            name='5.5',
+            name='5.5' + str(uuid.uuid4()),
             manager='mysql',
             image_id=str(uuid.uuid4()),
             active=1,
Download as text