shlist

share and manage lists between multiple people
Log | Files | Refs

commit e9c466b63516e50f18dd57c6114d7f914537019f
parent 0e16344b8ffafc9b9454a7b0ac16744249a13c1c
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat, 20 Feb 2016 22:55:07 -0700

sl: rename testd to testd.pl

Diffstat:
Mserver/coverage.sh | 2+-
Mserver/run_tests.sh | 5++++-
Dserver/testd | 43-------------------------------------------
Aserver/testd.pl | 44++++++++++++++++++++++++++++++++++++++++++++
Aserver/tests/friend_delete_unit/server.log | 7+++++++
Aserver/tests/friend_delete_unit/testd.log | 0
Mserver/tests/test.mk | 2+-
7 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/server/coverage.sh b/server/coverage.sh @@ -11,7 +11,7 @@ fi perl -MDevel::Cover sl -p $PORT -t & server_pid=$! -perl testd & +perl testd.pl & testd_pid=$! passed=0 diff --git a/server/run_tests.sh b/server/run_tests.sh @@ -16,7 +16,7 @@ fi perl -T sl -p $PORT -t > server.log & server_pid=$! -perl testd & +perl testd.pl > testd.log & testd_pid=$! ok=0 @@ -27,17 +27,20 @@ for t in `LC_ALL=C ls tests/*/Makefile`; do count=`expr $count + 1` test_dir=`dirname ${t}` > server.log + > testd.log # run test, complain if it failed if ! make -s -C $test_dir test; then printf "%3s %s: $red%s$reset\n" $count $test_dir "test failed" test_failed=$((test_failed + 1)) > server.log + > testd.log continue fi # copy server log aside for diff'ing cp server.log $test_dir/server.log + cp testd.log $test_dir/testd.log # diff the server's output log if ! make -s -C $test_dir diff; then diff --git a/server/testd b/server/testd @@ -1,43 +0,0 @@ -#!/usr/bin/perl -use warnings; -use strict; - -use Data::Dumper; -use IO::Socket::UNIX; -use JSON::XS; - -my $socket_path = "../testd.socket"; - -my $server = IO::Socket::UNIX->new( - Type => SOCK_STREAM(), - Local => $socket_path, - Listen => 1, -); -unless ($server) { - print "error: couldn't create socket: $!\n"; - exit 1; -} - -$SIG{INT} = \&unlink_socket; -$SIG{TERM} = \&unlink_socket; - -sub unlink_socket { - unlink $socket_path; -} - -while (my $client = $server->accept()) { - $client->read(my $data, 4096); - my $notify = decode_json($data); - - my $num_devices = @{ $notify->{devices} }; - next if ($num_devices == 0); - - print "testd: message type '$notify->{msg_type}'\n"; - # print "testd: payload is '" . Dumper($notify->{payload}) . "'\n"; - - for (@{ $notify->{devices} }) { - #print Dumper($_); - my ($os, $push_token) = @$_; - print "testd: sending to '$push_token' os '$os'\n"; - } -} diff --git a/server/testd.pl b/server/testd.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl +use warnings; +use strict; +$| = 1; + +use Data::Dumper; +use IO::Socket::UNIX; +use JSON::XS; + +my $socket_path = "../testd.socket"; + +my $server = IO::Socket::UNIX->new( + Type => SOCK_STREAM(), + Local => $socket_path, + Listen => 1, +); +unless ($server) { + print "error: couldn't create socket: $!\n"; + exit 1; +} + +$SIG{INT} = \&unlink_socket; +$SIG{TERM} = \&unlink_socket; + +sub unlink_socket { + unlink $socket_path; +} + +while (my $client = $server->accept()) { + $client->read(my $data, 4096); + my $notify = decode_json($data); + + my $num_devices = @{ $notify->{devices} }; + next if ($num_devices == 0); + + print "testd: message type '$notify->{msg_type}'\n"; + # print "testd: payload is '" . Dumper($notify->{payload}) . "'\n"; + + for (@{ $notify->{devices} }) { + #print Dumper($_); + my ($os, $push_token) = @$_; + print "testd: sending to '$push_token' os '$os'\n"; + } +} diff --git a/server/tests/friend_delete_unit/server.log b/server/tests/friend_delete_unit/server.log @@ -0,0 +1,7 @@ +new connection (pid = <digits>) +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +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> +disconnected! diff --git a/server/tests/friend_delete_unit/testd.log b/server/tests/friend_delete_unit/testd.log diff --git a/server/tests/test.mk b/server/tests/test.mk @@ -29,4 +29,4 @@ diff: process-server-log endif clean: - rm -f server.log + rm -f server.log testd.log