Zorba

Merge lp:~zorba-coders/zorba/jdbc-ctest-j8 into lp:zorba/jdbc-module

  1. jdbc-ctest-j8
  2. Merge into jdbc-module
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 47
Merged at revision: 47
Proposed branch: lp:~zorba-coders/zorba/jdbc-ctest-j8
Merge into: lp:zorba/jdbc-module
Diff against target: 126 lines (+16/-16)
8 files modified
test/Queries/01-creatingDB.xq (+2/-2)
test/Queries/02-select.xq (+2/-2)
test/Queries/03-connect-options.xq (+2/-2)
test/Queries/04-set-null.xq (+2/-2)
test/Queries/05-result-set.xq (+2/-2)
test/Queries/06-prepare.xq (+2/-2)
test/Queries/07-prepare.xq (+2/-2)
test/Queries/08-deletingDB.xq (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/jdbc-ctest-j8
Reviewer Review Type Date Requested Status
Rodolfo Ochoa Approve
Chris Hillery Approve
Review via email: mp+147336@code.launchpad.net

Commit message

Modify JDBC tests to use distinct databases, so they may be run in parallel.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/jdbc-ctest-j8-2013-02-08T11-04-11.563Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/jdbc-ctest-j8 into lp:zorba/jdbc-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job jdbc-ctest-j8-2013-02-08T11-04-11.563Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/jdbc-ctest-j8-2013-02-08T11-38-12.007Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job jdbc-ctest-j8-2013-02-08T11-38-12.007Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/Queries/01-creatingDB.xq'
2--- test/Queries/01-creatingDB.xq 2013-01-10 02:09:49 +0000
3+++ test/Queries/01-creatingDB.xq 2013-02-08 10:20:27 +0000
4@@ -5,9 +5,9 @@
5 "user" : "root",
6 "password" : ""});
7
8-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
9+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School01` /*!40100 DEFAULT CHARACTER SET latin1 */;");
10
11-jdbc:execute-update($connection, "USE `School`;");
12+jdbc:execute-update($connection, "USE `School01`;");
13
14 (: Table structures :)
15
16
17=== modified file 'test/Queries/02-select.xq'
18--- test/Queries/02-select.xq 2013-01-10 19:42:27 +0000
19+++ test/Queries/02-select.xq 2013-02-08 10:20:27 +0000
20@@ -5,9 +5,9 @@
21 "user" : "root",
22 "password" : ""});
23
24-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
25+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School02` /*!40100 DEFAULT CHARACTER SET latin1 */;");
26
27-jdbc:execute-update($connection, "USE `School`;");
28+jdbc:execute-update($connection, "USE `School02`;");
29
30 (: Table structures :)
31
32
33=== modified file 'test/Queries/03-connect-options.xq'
34--- test/Queries/03-connect-options.xq 2013-01-10 19:42:27 +0000
35+++ test/Queries/03-connect-options.xq 2013-02-08 10:20:27 +0000
36@@ -5,9 +5,9 @@
37 "user" : "root",
38 "password" : ""});
39
40-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
41+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School03` /*!40100 DEFAULT CHARACTER SET latin1 */;");
42
43-jdbc:execute-update($connection, "USE `School`;");
44+jdbc:execute-update($connection, "USE `School03`;");
45
46 (: Table structures :)
47
48
49=== modified file 'test/Queries/04-set-null.xq'
50--- test/Queries/04-set-null.xq 2013-01-10 19:42:27 +0000
51+++ test/Queries/04-set-null.xq 2013-02-08 10:20:27 +0000
52@@ -5,9 +5,9 @@
53 "user" : "root",
54 "password" : ""});
55
56-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
57+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School04` /*!40100 DEFAULT CHARACTER SET latin1 */;");
58
59-jdbc:execute-update($connection, "USE `School`;");
60+jdbc:execute-update($connection, "USE `School04`;");
61
62 (: Table structures :)
63
64
65=== modified file 'test/Queries/05-result-set.xq'
66--- test/Queries/05-result-set.xq 2013-01-10 19:42:27 +0000
67+++ test/Queries/05-result-set.xq 2013-02-08 10:20:27 +0000
68@@ -5,9 +5,9 @@
69 "user" : "root",
70 "password" : ""});
71
72-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
73+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School05` /*!40100 DEFAULT CHARACTER SET latin1 */;");
74
75-jdbc:execute-update($connection, "USE `School`;");
76+jdbc:execute-update($connection, "USE `School05`;");
77
78 (: Table structures :)
79
80
81=== modified file 'test/Queries/06-prepare.xq'
82--- test/Queries/06-prepare.xq 2013-01-10 19:42:27 +0000
83+++ test/Queries/06-prepare.xq 2013-02-08 10:20:27 +0000
84@@ -5,9 +5,9 @@
85 "user" : "root",
86 "password" : ""});
87
88-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
89+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School06` /*!40100 DEFAULT CHARACTER SET latin1 */;");
90
91-jdbc:execute-update($connection, "USE `School`;");
92+jdbc:execute-update($connection, "USE `School06`;");
93
94 (: Table structures :)
95
96
97=== modified file 'test/Queries/07-prepare.xq'
98--- test/Queries/07-prepare.xq 2013-01-10 19:42:27 +0000
99+++ test/Queries/07-prepare.xq 2013-02-08 10:20:27 +0000
100@@ -5,9 +5,9 @@
101 "user" : "root",
102 "password" : ""});
103
104-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
105+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School07` /*!40100 DEFAULT CHARACTER SET latin1 */;");
106
107-jdbc:execute-update($connection, "USE `School`;");
108+jdbc:execute-update($connection, "USE `School07`;");
109
110 (: Table structures :)
111
112
113=== modified file 'test/Queries/08-deletingDB.xq'
114--- test/Queries/08-deletingDB.xq 2013-01-10 19:42:27 +0000
115+++ test/Queries/08-deletingDB.xq 2013-02-08 10:20:27 +0000
116@@ -5,9 +5,9 @@
117 "user" : "root",
118 "password" : ""});
119
120-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
121+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School08` /*!40100 DEFAULT CHARACTER SET latin1 */;");
122
123-jdbc:execute-update($connection, "USE `School`;");
124+jdbc:execute-update($connection, "USE `School08`;");
125
126 (: Table structures :)
127

Subscribers

People subscribed via source and target branches

to all changes: