Author: rvesse
Date: Thu Aug 8 18:17:45 2013
New Revision: 1511911
URL: http://svn.apache.org/r1511911
Log:
Add some sleeps to try avoid apparent timing issue that causes build hangs
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java?rev=1511911&r1=1511910&r2=1511911&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
Thu Aug 8 18:17:45 2013
@@ -20,25 +20,14 @@ package org.apache.jena.jdbc.remote.resu
import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.jdbc.results.AbstractResultSetTests;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
/**
- * Abstract tests for remote endpoint connection result sets
- *
+ * Abstract tests for remote endpoint connection result sets
+ *
*/
public abstract class AbstractRemoteEndpointResultSetTests extends
AbstractResultSetTests {
static {
- // TEMPORARY - Trying to debug why builds hang on Apache build servers
- BasicConfigurator.resetConfiguration();
- BasicConfigurator.configure();
- Logger.getRootLogger().setLevel(Level.INFO);
- // END TEMPORARY
-
Fuseki.init();
-
-
}
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java?rev=1511911&r1=1511910&r2=1511911&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
Thu Aug 8 18:17:45 2013
@@ -55,20 +55,28 @@ public class TestRemoteEndpointResults e
/**
* Clean up after each test by resetting the Fuseki instance
+ * @throws InterruptedException
*/
@After
- public void cleanupTest() {
+ public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
+
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
}
/**
* Clean up after tests by de-allocating the Fuseki instance
* @throws SQLException
+ * @throws InterruptedException
*/
@AfterClass
- public static void cleanup() throws SQLException {
+ public static void cleanup() throws SQLException, InterruptedException {
ServerTest.freeServer();
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
+
connection.close();
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java?rev=1511911&r1=1511910&r2=1511911&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
Thu Aug 8 18:17:45 2013
@@ -101,22 +101,31 @@ public class TestRemoteEndpointResultsWi
/**
* Clean up after each test by resetting the Fuseki instance
+ * @throws InterruptedException
*/
@After
- public void cleanupTest() {
+ public void cleanupTest() throws InterruptedException {
Update clearRequest = new UpdateDrop(Target.ALL) ;
UpdateProcessor proc =
UpdateExecutionFactory.createRemote(clearRequest, ServerTest.serviceUpdate,
authenticator) ;
proc.execute() ;
+
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
}
/**
* Clean up after tests by de-allocating the Fuseki instance
*
* @throws SQLException
+ * @throws InterruptedException
*/
@AfterClass
- public static void cleanup() throws SQLException {
+ public static void cleanup() throws SQLException, InterruptedException {
server.stop();
+
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
+
connection.close();
realmFile.delete();
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java?rev=1511911&r1=1511910&r2=1511911&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
Thu Aug 8 18:17:45 2013
@@ -64,20 +64,28 @@ public class TestRemoteEndpointResultsWi
/**
* Clean up after each test by resetting the Fuseki instance
+ * @throws InterruptedException
*/
@After
- public void cleanupTest() {
+ public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
+
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
}
/**
* Clean up after tests by de-allocating the Fuseki instance
* @throws SQLException
+ * @throws InterruptedException
*/
@AfterClass
- public static void cleanup() throws SQLException {
+ public static void cleanup() throws SQLException, InterruptedException {
ServerTest.freeServer();
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
+
connection.close();
}
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java?rev=1511911&r1=1511910&r2=1511911&view=diff
==============================================================================
---
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
(original)
+++
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
Thu Aug 8 18:17:45 2013
@@ -55,20 +55,28 @@ public class TestRemoteEndpointResultsWi
/**
* Clean up after each test by resetting the Fuseki instance
+ * @throws InterruptedException
*/
@After
- public void cleanupTest() {
+ public void cleanupTest() throws InterruptedException {
ServerTest.resetServer();
+
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
}
/**
* Clean up after tests by de-allocating the Fuseki instance
* @throws SQLException
+ * @throws InterruptedException
*/
@AfterClass
- public static void cleanup() throws SQLException {
+ public static void cleanup() throws SQLException, InterruptedException {
ServerTest.freeServer();
+ // Sleep attempts to avoid a intermittent timing issue on the build
server that can result in hung builds
+ Thread.sleep(250);
+
connection.close();
}
