Merge branch 'master' into trevj-version-badge

trevj · trevj · commit f66d8cb1159d · 2016-01-07T15:55:56.000-05:00
diff --git a/src/integration-tests/socks-echo/base-spec.core-env.ts b/src/integration-tests/socks-echo/base-spec.core-env.ts
@@ -183,8 +183,9 @@ export function socksEchoTestDescription(useChurn:boolean) {
         }
         expect(event.connectionId).toEqual(connectionId);
         outputString += arraybuffers.arrayBufferToString(event.response);
-        if (outputString.indexOf('HTTP/1.0 404 Not Found') != -1 &&
-            outputString.indexOf(nonExistentPath) != -1) {
+        if ((outputString.indexOf('HTTP/1.0 404 Not Found') != -1 &&
+            outputString.indexOf(nonExistentPath) != -1) ||
+            outputString.indexOf('HTTP/1.1 403 Forbidden') != -1) {
           isDone = true;
           done();
         }

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,9 @@ export function socksEchoTestDescription(useChurn:boolean) {`
`183`	`183`	`}`
`184`	`184`	`expect(event.connectionId).toEqual(connectionId);`
`185`	`185`	`outputString += arraybuffers.arrayBufferToString(event.response);`
`186`		`- if (outputString.indexOf('HTTP/1.0 404 Not Found') != -1 &&`
`187`		`- outputString.indexOf(nonExistentPath) != -1) {`
	`186`	`+ if ((outputString.indexOf('HTTP/1.0 404 Not Found') != -1 &&`
	`187`	`+ outputString.indexOf(nonExistentPath) != -1) \|\|`
	`188`	`+ outputString.indexOf('HTTP/1.1 403 Forbidden') != -1) {`
`188`	`189`	`isDone = true;`
`189`	`190`	`done();`
`190`	`191`	`}`