shlist

commit 0b6e7634f9e15631e519e64f8d621ef9a34a1e5a
parent 9156b5adbd2d1f204c459d1c88e0ec4d87bbdd74
Author: kyle <kyle@0x30.net>
Date:   Sat,  2 Jan 2016 15:57:20 -0700

tests: rename, clean up and add additional check

Diffstat:
R
server/tests/leave_list_self/Makefile -> server/tests/leave_list/Makefile
 | 
0

A
server/tests/leave_list/server.log.good
 | 
14
++++++++++++++
A
server/tests/leave_list/test.pl
 | 
44
++++++++++++++++++++++++++++++++++++++++++++
D
server/tests/leave_list_self/server.log.good
 | 
13
-------------
D
server/tests/leave_list_self/test.pl
 | 
38
--------------------------------------

5 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/server/tests/leave_list_self/Makefile b/server/tests/leave_list/Makefile
diff --git a/server/tests/leave_list/server.log.good b/server/tests/leave_list/server.log.good
@@ -0,0 +1,14 @@
+accepting connections on <ip>:<port> (pid = <digits>)
+new connection (pid = <digits>)
+ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256'
+new_device: success, <digits>:<base64> os <base64>
+new_list: <string>
+new_list: adding first member devid = <base64>
+new_list: fingerprint = <base64>
+leave_list: device <base64>
+leave_list: list <base64>
+leave_list: device <base64> has been removed from list <base64>
+leave_list: list <base64> is empty... deleting
+list_get: gathering lists for <base64>
+list_get_other: gathering lists for <base64>
+disconnected!
diff --git a/server/tests/leave_list/test.pl b/server/tests/leave_list/test.pl
@@ -0,0 +1,44 @@
+#!/usr/bin/perl -I../
+use strict;
+use warnings;
+use test;
+
+# verify basic leave_list scenario where you create a list then leave it
+
+my $sock = new_socket();
+my $list_name = "this is a new list";
+
+# create a new device id
+send_msg($sock, 'new_device', "4038675309\0unix");
+my ($msg_data) = recv_msg($sock, 'new_device');
+
+my $device_id = check_status($msg_data, 'ok');
+
+# create a new list
+send_msg($sock, 'new_list', "$device_id\0$list_name");
+($msg_data) = recv_msg($sock, 'new_list');
+
+my $msg = check_status($msg_data, 'ok');
+my ($list_id) = split("\0", $msg);
+
+# leave the list
+send_msg($sock, 'leave_list', "$device_id\0$list_id");
+($msg_data) = recv_msg($sock, 'leave_list');
+
+$msg = check_status($msg_data, 'ok');
+my ($leave_id) = split("\0", $msg);
+fail "got leave data '$leave_id', expected $list_id" if ($leave_id ne $list_id);
+
+# verify we don't get this list back when requesting all lists
+send_msg($sock, 'list_get', $device_id);
+($msg_data) = recv_msg($sock, 'list_get');
+
+my $lists = check_status($msg_data, 'ok');
+fail "expected no lists" if ($lists ne "");
+
+# verify we don't get this list back when requesting other lists
+send_msg($sock, 'list_get_other', $device_id);
+($msg_data) = recv_msg($sock, 'list_get_other');
+
+$lists = check_status($msg_data, 'ok');
+fail "expected no lists" if ($lists ne "");
diff --git a/server/tests/leave_list_self/server.log.good b/server/tests/leave_list_self/server.log.good
@@ -1,13 +0,0 @@
-accepting connections on <ip>:<port> (pid = <digits>)
-new connection (pid = <digits>)
-ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256'
-new_device: success, <digits>:<base64> os <base64>
-new_list: <string>
-new_list: adding first member devid = <base64>
-new_list: fingerprint = <base64>
-leave_list: device <base64>
-leave_list: list <base64>
-leave_list: device <base64> has been removed from list <base64>
-leave_list: list <base64> is empty... deleting
-list_get: gathering lists for <base64>
-disconnected!
diff --git a/server/tests/leave_list_self/test.pl b/server/tests/leave_list_self/test.pl
@@ -1,38 +0,0 @@
-#!/usr/bin/perl -I../
-use strict;
-use warnings;
-use test;
-
-# this test:
-# - creates a new device
-# - creates a new list
-# - leaves that list
-# - verifies list is gone
-
-my $sock = new_socket();
-
-send_msg($sock, 'new_device', "4038675309\0unix");
-my ($msg_data) = recv_msg($sock, 'new_device');
-
-my $device_id = check_status($msg_data, 'ok');
-my $list_name = "this is a new list";
-
-send_msg($sock, 'new_list', "$device_id\0$list_name");
-($msg_data) = recv_msg($sock, 'new_list');
-
-my $msg = check_status($msg_data, 'ok');
-my ($list_id) = split("\0", $msg);
-
-send_msg($sock, 'leave_list', "$device_id\0$list_id");
-($msg_data) = recv_msg($sock, 'leave_list');
-
-$msg = check_status($msg_data, 'ok');
-my ($leave_id) = split("\0", $msg);
-fail "got leave data '$leave_id', expected $list_id" if ($leave_id ne $list_id);
-
-# verify we don't get this list back when requesting all lists
-send_msg($sock, 'list_get', $device_id);
-($msg_data) = recv_msg($sock, 'list_get');
-
-my $lists = check_status($msg_data, 'ok');
-fail "expected no lists" if ($lists ne "");