1 files changed, 13 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java
index 378dcaf46..dc4a3df54 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracFixture.java
@@ -17,6 +17,7 @@ import org.eclipse.mylyn.commons.net.IProxyProvider;
 import org.eclipse.mylyn.commons.net.WebLocation;
 import org.eclipse.mylyn.internal.trac.core.TracClientFactory;
 import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
+import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient;
 import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -196,15 +197,23 @@ public class TracFixture extends TestFixture {
 		return version;
 	}
 
-	@Override
-	public TaskRepository singleRepository() {
-		TracCorePlugin.getDefault().getConnector().getClientManager().writeCache();
+	public TaskRepository singleRepository(TracRepositoryConnector connector) {
+		connector.getClientManager().writeCache();
 		TaskRepository repository = super.singleRepository();
-		TracCorePlugin.getDefault().getConnector().getClientManager().readCache();
+
+		// XXX avoid failing test due to stale client
+		connector.getClientManager().clearClients();
+
+		connector.getClientManager().readCache();
 		return repository;
 	}
 
 	@Override
+	public TaskRepository singleRepository() {
+		return singleRepository(TracCorePlugin.getDefault().getConnector());
+	}
+
+	@Override
 	protected void configureRepository(TaskRepository repository) {
 		repository.setTimeZoneId(ITracClient.TIME_ZONE);
 		repository.setCharacterEncoding(ITracClient.CHARSET);