From 172a566c7948dfa48f0e6082e8b8e540c2f71697 Mon Sep 17 00:00:00 2001 From: lotodore Date: Thu, 8 Nov 2007 21:42:22 +0000 Subject: [PATCH] Testing two test cases in parallel. --- tests/pkth.scm | 9 +++++---- tests/pkth_tests.scm | 28 +++++++++++++--------------- tests/sock.scm | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/tests/pkth.scm b/tests/pkth.scm index 0281bde4..ac0aa043 100644 --- a/tests/pkth.scm +++ b/tests/pkth.scm @@ -263,10 +263,11 @@ (define pkth-create-random-name (lambda () - (let ((name (list 84 101 115 116)) (randstate (seed->random-state (cdr (gettimeofday))))) - (dotimes (n 10) - (append! name (list (+ 48 (random 10 randstate))))) - (bytes->string name)))) + (let ((time (gettimeofday))) + (let ((name (list 84 101 115 116)) (randstate (seed->random-state (+ (car time) (cdr time))))) + (dotimes (n 10) + (append! name (list (+ 48 (random 10 randstate))))) + (bytes->string name))))) (define pkth-create-init-ex (lambda (version-major version-minor privacy-flags avatar-md5 password player-name) diff --git a/tests/pkth_tests.scm b/tests/pkth_tests.scm index b5985d30..f9f7a5de 100644 --- a/tests/pkth_tests.scm +++ b/tests/pkth_tests.scm @@ -113,11 +113,11 @@ (define (pkth-test-start-leave-game) (let ((sock (pkth-connect))) - (pkth-send-message sock (pkth-create-init '() "" "client1")) + (pkth-send-message sock (pkth-create-init '() "" (pkth-create-random-name))) (display "Waiting for Init-Ack...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-init-ack?) '() 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-init-ack?) '() 20000) (display "Starting and leaving loads of games...\n") - (dotimes (n 256) + (dotimes (n 1024) (pkth-send-message sock (pkth-create-create-game (pkth-create-game-info @@ -136,27 +136,25 @@ "test game" "test password" )) - (display "Waiting for Game List New / Join Game Ack / Game List Player Joined...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-game-list-new? pkth-is-type-join-game-ack? pkth-is-type-game-list-player-joined?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-update? pkth-is-type-game-list-player-left?) 5000) - (wait-for-message sock pkth-recv-message (list pkth-is-type-game-list-new? pkth-is-type-join-game-ack? pkth-is-type-game-list-player-joined?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-update? pkth-is-type-game-list-player-left?) 5000) - (wait-for-message sock pkth-recv-message (list pkth-is-type-game-list-new? pkth-is-type-join-game-ack? pkth-is-type-game-list-player-joined?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-update? pkth-is-type-game-list-player-left?) 5000) + (display "Waiting for Join Game Ack...\n") + (wait-for-message sock pkth-recv-message (list pkth-is-type-join-game-ack?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-all?) 20000) (pkth-send-message sock (pkth-create-start-event pkth-start-flag-fill-with-cpu-players)) (display "Waiting for Start Event...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-start-event?) (list pkth-is-type-statistics-changed? pkth-is-type-player-joined? pkth-is-type-game-list-player-joined? pkth-is-type-game-list-update?) 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-start-event?) (list pkth-is-type-statistics-changed? pkth-is-type-player-joined? pkth-is-type-game-list-all?) 20000) (pkth-send-message sock (pkth-create-start-event-ack)) (display "Waiting for Game Start...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-game-start?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-player-joined? pkth-is-type-game-list-update?) 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-game-start?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-all?) 20000) (display "Waiting for Hand Start...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-hand-start?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-player-joined? pkth-is-type-game-list-update?) 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-hand-start?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-all?) 20000) (display "Waiting for Players Turn...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-players-turn?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-player-joined? pkth-is-type-players-action-done? pkth-is-type-game-list-update?) 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-players-turn?) (list pkth-is-type-statistics-changed? pkth-is-type-players-action-done? pkth-is-type-game-list-all?) 20000) (pkth-send-message sock (pkth-create-leave-current-game)) (display "Waiting for Removed From Game...\n") - (wait-for-message sock pkth-recv-message (list pkth-is-type-removed-from-game?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-player-joined? pkth-is-type-game-list-update? pkth-is-type-game-list-player-left?) 5000) + (wait-for-message sock pkth-recv-message (list pkth-is-type-removed-from-game?) (list pkth-is-type-statistics-changed? pkth-is-type-players-action-done? pkth-is-type-players-turn? pkth-is-type-player-left? pkth-is-type-deal-flop-cards? pkth-is-type-end-of-hand-hide-cards? pkth-is-type-game-list-all?) 20000) ) (sock-close sock) )) -;(set! pkth-test-list (test-register pkth-test-list "PKTH Test 3: Starting and leaving games" pkth-test-start-leave-game)) +(set! pkth-test-list (test-register pkth-test-list "PKTH Test 3: Starting and leaving games" pkth-test-start-leave-game)) (define (pkth-test-run-game) (let ((sock (pkth-connect))) @@ -183,7 +181,7 @@ (pkth-create-random-name) "test password" )) - (display "Join Game Ack...\n") + (display "Waiting for Join Game Ack...\n") (wait-for-message sock pkth-recv-message (list pkth-is-type-join-game-ack?) (list pkth-is-type-statistics-changed? pkth-is-type-game-list-all?) 20000) (pkth-send-message sock (pkth-create-start-event pkth-start-flag-fill-with-cpu-players)) (display "Waiting for Start Event...\n") @@ -199,7 +197,7 @@ ) (sock-close sock) )) -(set! pkth-test-list (test-register pkth-test-list "PKTH Test 4: Running games" pkth-test-run-game)) +;(set! pkth-test-list (test-register pkth-test-list "PKTH Test 4: Running games" pkth-test-run-game)) (test-run-all pkth-test-list) diff --git a/tests/sock.scm b/tests/sock.scm index 1856aaa6..1cdb94c1 100644 --- a/tests/sock.scm +++ b/tests/sock.scm @@ -140,7 +140,7 @@ (lambda (sock buf) (let ((ret (sctp-recvmsg! (car sock) buf))) (let ((info (list-ref ret 3))) ; Return number of bytes, stream # and PPID - (list (car ret) (ntohs (car info)) (ntohl (list-ref info 2))))))) + (list (car ret) (car info) (ntohl (list-ref info 2))))))) #! (sock-send (car (sock-accept (sock-bind-listen (sock-create-tcp AF_INET) "127.0.0.1" 5555 5))) "Hallo")