Merge lp:~mmcm/akiban-server/direct-update-it-bindings into lp:~akiban-technologies/akiban-server/trunk

Proposed by Mike McMahon
Status: Merged
Approved by: Nathan Williams
Approved revision: 2648
Merged at revision: 2649
Proposed branch: lp:~mmcm/akiban-server/direct-update-it-bindings
Merge into: lp:~akiban-technologies/akiban-server/trunk
Diff against target: 23 lines (+6/-0)
1 file modified
src/test/java/com/akiban/direct/DirectUpdateIT.java (+6/-0)
To merge this branch: bzr merge lp:~mmcm/akiban-server/direct-update-it-bindings
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Review via email: mp+161202@code.launchpad.net

Description of the change

Newly added IT didn't always run properly because didn't guarantee services restart.

The order of test execution is somewhat unpredictable, so it passed in Jenkins.

To post a comment you must log in.
Revision history for this message
Nathan Williams (nwilliams) wrote :

As described.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/test/java/com/akiban/direct/DirectUpdateIT.java'
--- src/test/java/com/akiban/direct/DirectUpdateIT.java 2013-04-24 15:50:16 +0000
+++ src/test/java/com/akiban/direct/DirectUpdateIT.java 2013-04-26 17:43:33 +0000
@@ -26,6 +26,7 @@
26import java.sql.Date;26import java.sql.Date;
27import java.sql.SQLException;27import java.sql.SQLException;
28import java.sql.Timestamp;28import java.sql.Timestamp;
29import java.util.Map;
2930
30import org.junit.After;31import org.junit.After;
31import org.junit.Before;32import org.junit.Before;
@@ -57,6 +58,11 @@
57 return super.serviceBindingsProvider().bindAndRequire(EmbeddedJDBCService.class, EmbeddedJDBCServiceImpl.class);58 return super.serviceBindingsProvider().bindAndRequire(EmbeddedJDBCService.class, EmbeddedJDBCServiceImpl.class);
58 }59 }
5960
61 @Override
62 protected Map<String, String> startupConfigProperties() {
63 return uniqueStartupConfigProperties(DirectUpdateIT.class);
64 }
65
60 @Before66 @Before
61 public void setUp() throws Exception {67 public void setUp() throws Exception {
62 startTestServices();68 startTestServices();

Subscribers

People subscribed via source and target branches