Browse Source

Fixed unit test for ARM platform (just stupid timeout

fixing 018090
master
Artyom Beilis 14 years ago
parent
commit
758b204526
2 changed files with 10 additions and 1 deletions
  1. +7
    -0
      test_no_cmake.sh
  2. +3
    -1
      tests/cache_backend_test.cpp

+ 7
- 0
test_no_cmake.sh View File

@@ -76,6 +76,8 @@ run_test ./multipart_parser_test ../tests

run_test ./form_test -c ../tests/form_test.js "--test-exec=$PYTHON ../tests/form_test.py"
run_test ./cookie_test -c ../tests/cookie_test.js "--test-exec=$PYTHON ../tests/cookie_test.py"
run_test ./status_test -c ../tests/status_test.js --test-async=async "--test-exec=$PYTHON ../tests/status_test.py async"
run_test ./status_test -c ../tests/status_test.js "--test-exec=$PYTHON ../tests/status_test.py"
run_test ./forwarder_test -c ../tests/forwarder_test.js --test-internal=true "--test-exec=$PYTHON ../tests/forwarder_test.py"
run_test ./forwarder_test -c ../tests/forwarder_test.js --test-internal=false "--test-exec=$PYTHON ../tests/forwarder_test.py"
run_test ./jsonrpc_test -c ../tests/jsonrpc_test.js "--test-exec=$PYTHON ../tests/jsonrpc_test.py"
@@ -83,11 +85,16 @@ run_test ./proto_test -c ../tests/proto_test.js --test-async=async --service-api
run_test ./proto_test -c ../tests/proto_test.js --test-async=sync --service-api=http --service-port=8080 "--test-exec=$PYTHON ../tests/proto_test.py http"
run_test ./proto_test -c ../tests/proto_test.js --test-async=async --service-api=scgi --service-port=8080 "--test-exec=$PYTHON ../tests/proto_test.py scgi_tcp"
run_test ./proto_test -c ../tests/proto_test.js --test-async=sync --service-api=scgi --service-port=8080 "--test-exec=$PYTHON ../tests/proto_test.py scgi_tcp"
run_test ./proto_test -c ../tests/proto_test.js --test-async=async --service-api=fastcgi --service-port=8080 "--test-exec=$PYTHON ../tests/proto_test.py fastcgi_tcp"
run_test ./proto_test -c ../tests/proto_test.js --test-async=sync --service-api=fastcgi --service-port=8080 "--test-exec=$PYTHON ../tests/proto_test.py fastcgi_tcp"


if test "x$NOUNIX" = "x"
then
run_test ./proto_test -c ../tests/proto_test.js --test-async=async --service-api=scgi --service-socket=/tmp/cppcms_test_socket "--test-exec=$PYTHON ../tests/proto_test.py scgi_unix"
run_test ./proto_test -c ../tests/proto_test.js --test-async=sync --service-api=scgi --service-socket=/tmp/cppcms_test_socket "--test-exec=$PYTHON ../tests/proto_test.py scgi_unix"
run_test ./proto_test -c ../tests/proto_test.js --test-async=async --service-api=fastcgi --service-socket=/tmp/cppcms_test_socket "--test-exec=$PYTHON ../tests/proto_test.py fastcgi_unix"
run_test ./proto_test -c ../tests/proto_test.js --test-async=sync --service-api=fastcgi --service-socket=/tmp/cppcms_test_socket "--test-exec=$PYTHON ../tests/proto_test.py fastcgi_unix"
fi

if test -e fail.flag


+ 3
- 1
tests/cache_backend_test.cpp View File

@@ -73,7 +73,9 @@ void test_cache(booster::intrusive_ptr<cppcms::impl::base_cache> cache,bool test
TEST(cache->fetch("bee",tmp,0) && tmp=="bzzz");
cache->clear();
tags.clear();
cache->store("fu","fu",tags,time(0)+5);
cache->store("fu","fu",tags,time(0)+25);
// 25 - make sure it works on slow platforms like
// ARM emulator
for(unsigned i=0;i<1000;i++) {
std::ostringstream key;
key << i;


Loading…
Cancel
Save