From dc1e7263f5685b087d4f0b8a78a2dd57acebd79a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 27 Feb 2017 10:09:04 -0500 Subject: [PATCH 1/2] Fix tests on CI partial revert of 8b3b2836128a7244822fe4204a0e26139f8b140a Easier for travis to fetch from https URL. If you as a developer want to push to the submodule via git (maintainers only) you'll have to modify your local git remotes after checkout: cd Carthage git remote origin set-url git@github.com:WhisperSystems/Signal-Carthage.git // FREEBIE --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4e241f34f..0f5af92bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Carthage"] path = Carthage - url = git@github.com:WhisperSystems/Signal-Carthage.git + url = https://github.com/WhisperSystems/Signal-Carthage.git From f37b8bac0f459d2142568a90a5229ed197e1b43a Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 27 Feb 2017 10:23:49 -0500 Subject: [PATCH 2/2] Fix test to use updated PeerConnectionClient API // FREEBIE --- Signal/test/call/PeerConnectionClientTest.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Signal/test/call/PeerConnectionClientTest.swift b/Signal/test/call/PeerConnectionClientTest.swift index edd9d5215..53e0afc6c 100644 --- a/Signal/test/call/PeerConnectionClientTest.swift +++ b/Signal/test/call/PeerConnectionClientTest.swift @@ -55,7 +55,7 @@ class PeerConnectionClientTest: XCTestCase { let iceServers = [RTCIceServer]() clientDelegate = FakePeerConnectionClientDelegate() - client = PeerConnectionClient(iceServers: iceServers, delegate: clientDelegate, callDirection: .outgoing) + client = PeerConnectionClient(iceServers: iceServers, delegate: clientDelegate, callDirection: .outgoing, useTurnOnly: false) peerConnection = client.peerConnectionForTests() dataChannel = client.dataChannelForTests() }