Merge branch 'master' into stream-timeout

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/cassettes/test_instance_peers.yaml b/tests/cassettes/test_instance_peers.yaml
new file mode 100644
index 0000000..0cac91f
--- /dev/null
+++ b/tests/cassettes/test_instance_peers.yaml
@@ -0,0 +1,28 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      User-Agent: [python-requests/2.9.1]
+    method: GET
+    uri: http://localhost:3000/api/v1/instance/peers
+  response:
+    body: {string: '[]'}
+    headers:
+      Cache-Control: ['max-age=86400, public']
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Sun, 06 May 2018 00:59:42 GMT']
+      ETag: [W/"5df1bbcb99fdb348731d6100eec9b007"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [2275419d-3fd5-43ab-884b-acd98e31931a]
+      X-Runtime: ['0.041601']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['2']
+    status: {code: 200, message: OK}
+version: 1