commit 3713625c0d84ba601129cd53033c88df9b0d4a65 parent fb548ecf3854d4f0aafa6e401508fd1aa30befd4 Author: kyle <kyle@0x30.net> Date: Wed, 10 Feb 2016 19:21:24 -0700 sl/tests: update server.log.good's to catch up with server changes Diffstat:
10 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/server/tests/bad_payloads/server.log.good b/server/tests/bad_payloads/server.log.good @@ -1,6 +1,6 @@ new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -error: payload wasn't json +device_add: error: payload wasn't json new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -error: json payload didn't have dictionary root +device_add: error: json payload didn't have dictionary root diff --git a/server/tests/device_add/server.log.good b/server/tests/device_add/server.log.good @@ -2,7 +2,7 @@ new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' device_add: success, <digits>:<base64> os <base64> device_add: phone number <digits> already exists -device_add: phone number '403867530&' invalid +device_add: phone number invalid device_add: unknown operating system <base64> device_add: success, <digits>:<base64> os <base64> device_add: success, <digits>:<base64> os <base64> diff --git a/server/tests/device_update/server.log.good b/server/tests/device_update/server.log.good @@ -1,5 +1,4 @@ new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' device_add: success, <digits>:<base64> os <base64> -device_update: push token = <base64> disconnected! diff --git a/server/tests/friend_delete_unit/server.log.good b/server/tests/friend_delete_unit/server.log.good @@ -4,4 +4,6 @@ device_add: success, <digits>:<base64> os <base64> friend_delete: tried deleting friend <digits> but they weren't a friend friend_delete: bad friends number <base64> friend_delete: bad friends number <digits> +friend_add: <base64> adding <digits> +friend_delete: removing <digits> from friends list disconnected! diff --git a/server/tests/header/server.log.good b/server/tests/header/server.log.good @@ -6,10 +6,10 @@ ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: unsupported protocol version 101 new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -error: 25143 byte payload invalid +device_add: error: 25143 byte payload invalid new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -disconnected! +device_add: disconnected! new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' disconnected! diff --git a/server/tests/leave_list_your_not_in/server.log.good b/server/tests/leave_list_your_not_in/server.log.good @@ -1,8 +1,6 @@ new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' device_add: success, <digits>:<base64> os <base64> -list_leave: device <base64> -list_leave: list <digits> list_leave: tried to leave a list the user was not in for device <base64> and list <digits> disconnected! new connection (pid = <digits>) diff --git a/server/tests/list_join_unit/server.log.good b/server/tests/list_join_unit/server.log.good @@ -5,7 +5,5 @@ list_join: unknown list number <digits> list_add: device <base64> list_add: new list name <string> list_add: new list number is <digits> -list_join: device <base64> -list_join: list <digits> list_join: tried to create a duplicate list member entry for device <base64> and list <digits> disconnected! diff --git a/server/tests/list_leave/server.log.good b/server/tests/list_leave/server.log.good @@ -4,10 +4,10 @@ device_add: success, <digits>:<base64> os <base64> list_add: device <base64> list_add: new list name <string> list_add: new list number is <digits> -list_leave: device <base64> -list_leave: list <digits> list_leave: device <base64> has been removed from list <digits> list_leave: list <digits> is empty... deleting +list_leave: device <base64> +list_leave: list <digits> lists_get: gathering lists for <base64> lists_get_other: gathering lists for <base64> disconnected! diff --git a/server/tests/list_update/server.log.good b/server/tests/list_update/server.log.good @@ -6,19 +6,19 @@ list_update: unknown list number <digits> list_add: device <base64> list_add: new list name <string> list_add: new list number is <digits> -list_update: num = 211 +list_update: num = <digits> list_update: name = <string> lists_get: gathering lists for <base64> lists_get: found list <digits>:<string> lists_get: list has 1 members lists_get: list has 0 items -list_update: num = 211 +list_update: num = <digits> list_update: date = 12345 lists_get: gathering lists for <base64> lists_get: found list <digits>:<string> lists_get: list has 1 members lists_get: list has 0 items -list_update: num = 211 +list_update: num = <digits> list_update: name = <string> list_update: date = 54321 lists_get: gathering lists for <base64> diff --git a/server/tests/zero_payload/server.log.good b/server/tests/zero_payload/server.log.good @@ -1,6 +1,6 @@ new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -device_add: bad request, missing key 'phone_number' +device_add: phone number invalid device_update: bad request, missing key 'device_id' friend_add: bad request, missing key 'device_id' friend_delete: bad request, missing key 'device_id'