From 45dd10db9d670b1169567daa45c1ec3f528a1151 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 2 Nov 2018 12:46:47 -0300
Subject: [PATCH] [core] Fix non-determinism in introduction integration tests

---
 .../introduction/IntroductionIntegrationTest.java      |  4 ++--
 .../briarproject/briar/test/BriarIntegrationTest.java  | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
index e4faef505..917015f83 100644
--- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java
@@ -595,7 +595,7 @@ public class IntroductionIntegrationTest
 	@Test
 	public void testIntroductionToExistingContact() throws Exception {
 		// let contact1 and contact2 add each other already
-		addContacts1And2();
+		addContacts1And2(true);
 		assertNotNull(contactId2From1);
 		assertNotNull(contactId1From2);
 
@@ -650,7 +650,7 @@ public class IntroductionIntegrationTest
 	@Test
 	public void testIntroductionToRemovedContact() throws Exception {
 		// let contact1 and contact2 add each other
-		addContacts1And2();
+		addContacts1And2(true);
 		assertNotNull(contactId2From1);
 		assertNotNull(contactId1From2);
 
diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
index 8a27ea878..c278b83bb 100644
--- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java
@@ -309,6 +309,11 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 	}
 
 	protected void addContacts1And2() throws Exception {
+		addContacts1And2(false);
+	}
+
+	protected void addContacts1And2(boolean haveTransportProperties)
+			throws Exception {
 		contactId2From1 = contactManager1
 				.addContact(author2, author1.getId(), getSecretKey(),
 						clock.currentTimeMillis(), true, true, true);
@@ -319,7 +324,10 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
 		// Sync initial client versioning updates
 		sync1To2(1, true);
 		sync2To1(1, true);
-		sync1To2(1, true);
+		sync1To2(haveTransportProperties ? 2 : 1, true);
+		if (haveTransportProperties) {
+			sync2To1(1, true);
+		}
 	}
 
 	@After