tests: minor tweaks for the http2 test mode.

Author: agentzh

.travis.yml

@@ -84,6 +84,7 @@ install:
   - git clone https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module
   - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
   - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql
   - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
 
 before_script:

t/000--init.t

@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 3);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 $ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
@@ -14,9 +14,13 @@ our $http_config = <<'_EOC_';
         drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
                        dbname=ngx_test user=ngx_test password=ngx_test;
     }
+
+    lua_package_path "../lua-resty-mysql/lib/?.lua;;";
 _EOC_
 
 no_shuffle();
+no_long_string();
+
 run_tests();
 
 __DATA__
@@ -25,51 +29,46 @@ __DATA__
 --- http_config eval: $::http_config
 --- config
     location = /init {
-        drizzle_pass   database;
-        drizzle_query  "DROP TABLE IF EXISTS conv_uid";
-    }
---- request
-GET /init
---- error_code: 200
---- timeout: 10
---- no_error_log
-[error]
-
-
-
-=== TEST 2: conv_uid - create table
---- http_config eval: $::http_config
---- config
-    location = /init {
-        drizzle_pass   database;
-        drizzle_query  "CREATE TABLE conv_uid(id serial primary key, new_uid integer, old_uid integer)";
+        content_by_lua_block {
+            local mysql = require "resty.mysql"
+            local db = assert(mysql:new())
+            local ok, err, errcode, sqlstate = db:connect{
+                host = "127.0.0.1",
+                port = $TEST_NGINX_MYSQL_PORT,
+                database = "ngx_test",
+                user = "ngx_test",
+                password = "ngx_test",
+                charset = "utf8",
+            }
+
+            local queries = {
+                "DROP TABLE IF EXISTS conv_uid",
+                "CREATE TABLE conv_uid(id serial primary key, new_uid integer, old_uid integer)",
+                "INSERT INTO conv_uid(old_uid,new_uid) VALUES(32,56),(35,78)",
+            }
+
+            for _, query in ipairs(queries) do
+                local ok, err = db:query(query)
+                if not ok then
+                    ngx.say("failed to run mysql query \"", query, "\": ", err)
+                    return
+                end
+            end
+
+            ngx.say("done!")
+        }
     }
 --- request
 GET /init
---- error_code: 200
---- timeout: 10
---- no_error_log
-[error]
-
-
-
-=== TEST 3: conv_uid - insert value
---- http_config eval: $::http_config
---- config
-    location = /init {
-        drizzle_pass   database;
-        drizzle_query  "INSERT INTO conv_uid(old_uid,new_uid) VALUES(32,56),(35,78)";
-    }
---- request
-GET /init
---- error_code: 200
+--- response_body
+done!
 --- timeout: 10
 --- no_error_log
 [error]
 
 
 
-=== TEST 4: flush data from memcached
+=== TEST 2: flush data from memcached
 --- config
     location /flush {
         set $memc_cmd flush_all;

t/002-content.t

@@ -10,7 +10,7 @@ use Test::Nginx::Socket::Lua;
 repeat_each(2);
 #repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 19);
+plan tests => repeat_each() * (blocks() * 2 + 23);
 
 #no_diff();
 #no_long_string();
@@ -539,6 +539,9 @@ GET /main
 Content-Length: 12
 --- response_body chop
 hello, world
+--- no_error_log
+[error]
+[alert]
 
 
 
@@ -761,6 +764,9 @@ Content-Length: 13
 hello,
 world
 --- timeout: 5
+--- no_error_log
+[error]
+[alert]