Skip to content

Commit dbc2704

Browse files
committed
Debug info for travis build
1 parent 61fd212 commit dbc2704

3 files changed

Lines changed: 41 additions & 2 deletions

File tree

DVR/Cassette.swift

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,31 @@ struct Cassette {
1919
// MARK: - Functions
2020

2121
func interactionForRequest(request: NSURLRequest) -> Interaction? {
22+
print("REQUEST")
23+
print(request.HTTPMethod)
24+
print(request.URL)
25+
if let body = request.HTTPBody {
26+
print(Interaction.encodeBody(body, headers: request.allHTTPHeaderFields))
27+
} else {
28+
print("[empty body]")
29+
}
30+
print("")
2231
for interaction in interactions {
2332
let interactionRequest = interaction.request
2433

34+
print("INTERACTION")
35+
print(interactionRequest.HTTPMethod)
36+
print(interactionRequest.URL)
37+
if let body = interactionRequest.HTTPBody {
38+
print(Interaction.encodeBody(body, headers: interactionRequest.allHTTPHeaderFields))
39+
} else {
40+
print("[empty body]")
41+
}
42+
print("")
43+
2544
// Note: We don't check headers right now
2645
if interactionRequest.HTTPMethod == request.HTTPMethod && interactionRequest.URL == request.URL && interactionRequest.hasHTTPBodyEqualToThatOfRequest(request) {
46+
print("MATCHED!")
2747
return interaction
2848
}
2949
}

DVR/Session.swift

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ public class Session: NSURLSession {
6666
}
6767

6868
public override func uploadTaskWithRequest(request: NSURLRequest, fromFile fileURL: NSURL, completionHandler: (NSData?, NSURLResponse?, NSError?) -> Void) -> NSURLSessionUploadTask {
69+
print(fileURL)
70+
print("File exists: \(NSFileManager.defaultManager().fileExistsAtPath(fileURL.path!))")
6971
let data = NSData(contentsOfURL: fileURL)
72+
print("DATA-2")
73+
print(data)
7074
return addUploadTask(request, fromData: data, completionHandler: completionHandler)
7175
}
7276

@@ -162,7 +166,12 @@ public class Session: NSURLSession {
162166

163167
private func addUploadTask(request: NSURLRequest, fromData data: NSData?, completionHandler: SessionUploadTask.Completion? = nil) -> NSURLSessionUploadTask {
164168
var modifiedRequest = backingSession.configuration.HTTPAdditionalHeaders.map(request.requestByAppendingHeaders) ?? request
165-
modifiedRequest = data.map(modifiedRequest.requestWithBody) ?? modifiedRequest
169+
print("DATA-3")
170+
print(data)
171+
let mapped = data.map(modifiedRequest.requestWithBody)
172+
print("MAPPED")
173+
print(mapped)
174+
modifiedRequest = mapped ?? modifiedRequest
166175
let task = SessionUploadTask(session: self, request: modifiedRequest, completion: completionHandler)
167176
addTask(task.dataTask)
168177
return task

DVR/Tests/SessionUploadTests.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ class SessionUploadTests: XCTestCase {
2525
guard let fileData = NSData(contentsOfURL: testFile) else { XCTFail("Missing body data"); return }
2626
let data = encodeMultipartBody(fileData, parameters: [:])
2727
let file = writeDataToFile(data, fileName: "upload-file")
28+
print("DATA")
29+
print(data)
30+
print("FILE")
31+
print(file)
32+
print("File exists: \(NSFileManager.defaultManager().fileExistsAtPath(file.path!))")
33+
let check = NSData(contentsOfURL: file)
34+
print("DATA-1.2")
35+
print(check)
2836

2937
session.uploadTaskWithRequest(request, fromFile: file) { data, response, error in
3038
if let error = error {
@@ -99,7 +107,9 @@ class SessionUploadTests: XCTestCase {
99107

100108
let url = documentsURL.URLByAppendingPathComponent(fileName + ".tmp")
101109

102-
data.writeToURL(url, atomically: true)
110+
if !data.writeToURL(url, atomically: true) {
111+
XCTFail("Failed to write to \(url)")
112+
}
103113
return url
104114
}
105115

0 commit comments

Comments
 (0)