#76 - auto tests. Feature was commited before (w/o an issue).

Author: dedok

Makefile

@@ -21,6 +21,7 @@ INC_FLAGS  += -I$(CUR_PATH)/third_party/msgpuck
 INC_FLAGS  += -I$(CUR_PATH)/src
 YAJL_LIB    = $(YAJL_PATH)/build/yajl-2.1.0/lib/libyajl_s.a
 LDFLAGS     = -L$(YAJL_PATH)/build/yajl-2.1.0/lib
+PREFIX      = /usr/local/nginx
 
 DEV_CFLAGS += -ggdb3 -O0 -Wall -Werror
 
@@ -41,10 +42,15 @@ gen_version:
 build: gen_version utils
 	$(MAKE) -C $(NGX_PATH)
 
-configure:
+__install:
 	cd $(NGX_PATH) && $(NGX_CONFIGURE) \
-			--with-cc-opt='$(INC_FLAGS)'\
-			--add-module='$(MODULE_PATH)'
+			--with-cc-opt='$(INC_FLAGS)' \
+			--add-module='$(MODULE_PATH)' \
+			--prefix=$(PREFIX)
+	make -j2
+	sudo mkdir -p $(PREFIX)/conf $(PREFIX)/logs $(PREFIX)/sbin
+	sudo cp -Rf $(NGX_PATH)/conf/* $(PREFIX)/conf
+	sudo cp $(NGX_PATH)/objs/nginx $(PREFIX)/sbin/nginx
 
 configure-as-dynamic:
 	cd $(NGX_PATH) && $(NGX_CONFIGURE) --add-dynamic-module='$(MODULE_PATH)'
@@ -55,16 +61,8 @@ configure-debug:
 						--prefix=$(PREFIX_PATH) \
 						--add-module=$(MODULE_PATH) \
 						--with-debug
-	mkdir -p $(PREFIX_PATH)/conf $(PREFIX_PATH)/logs
-	cp -Rf $(NGX_PATH)/conf/* $(PREFIX_PATH)/conf
-	cp -f $(CUR_PATH)/test/ngx_confs/tnt_server_test.conf $(PREFIX_PATH)/conf/tnt_server_test.conf
-	cp -f $(CUR_PATH)/test/ngx_confs/nginx.dev.conf $(PREFIX_PATH)/conf/nginx.conf
 
-configure-for-testing:
-	cd $(NGX_PATH) && $(NGX_CONFIGURE) \
-						--with-cc-opt='$(INC_FLAGS)'\
-						--prefix=$(PREFIX_PATH) \
-						--add-module=$(MODULE_PATH)
+configure-for-testing: configure-debug
 	mkdir -p $(PREFIX_PATH)/conf $(PREFIX_PATH)/logs
 	cp -Rf $(NGX_PATH)/conf/* $(PREFIX_PATH)/conf
 	cp -f $(CUR_PATH)/test/ngx_confs/tnt_server_test.conf $(PREFIX_PATH)/conf/tnt_server_test.conf
@@ -77,8 +75,6 @@ configure-as-dynamic-debug:
 						--add-dynamic-module=$(MODULE_PATH) \
 						--with-debug
 	mkdir -p $(PREFIX_PATH)/conf $(PREFIX_PATH)/logs $(PREFIX_PATH)/modules
-#	cp -f $(CUR_PATH)/nginx/objs/ngx_http_tnt_module.so $(PREFIX_PATH)/modules/ngx_http_tnt_module.so
-#	cp -f $(CUR_PATH)/nginx/objs/ngx_http_tnt_module.so /usr/local/nginx/modules/ngx_http_tnt_module.so
 	cp -Rf $(NGX_PATH)/conf/* $(PREFIX_PATH)/conf
 	cp -f $(CUR_PATH)/test/ngx_confs/nginx.dev.dyn.conf $(PREFIX_PATH)/conf/nginx.conf
 	cp -f $(CUR_PATH)/test/ngx_confs/tnt_server_test.conf $(PREFIX_PATH)/conf/tnt_server_test.conf

src/ngx_http_tnt_version.h

@@ -33,6 +33,6 @@
 #ifndef NGX_HTTP_TNT_VERSION_H
 #define NGX_HTTP_TNT_VERSION_H 1
 
-#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.3.5"
+#define NGX_HTTP_TNT_MODULE_VERSION_STRING "v2.3.6"
 
 #endif

test/http_utils.py

@@ -13,6 +13,33 @@
 BASE_URL = 'http://0.0.0.0:8081'
 
 
+def post_form(url, values, headers=None):
+    out = '{}'
+    try:
+        data = urllib.urlencode(values)
+        req = urllib2.Request(url, data)
+        if headers:
+            for header in headers:
+                req.add_header(header, headers[header])
+        response = urllib2.urlopen(req)
+        out = response.read()
+        rc = response.getcode()
+        if VERBOSE:
+            print("code: ", rc, " recv: '", out, "'")
+        if rc != 500:
+            return (rc, json.loads(out))
+        return (rc, False)
+    except urllib2.HTTPError as e:
+        if e.code == 400:
+            out = e.read();
+        if VERBOSE:
+            print("code: ", e.code, " recv: '", out, "'")
+        return (e.code, json.loads(out))
+    except Exception as e:
+        print(traceback.format_exc())
+        return (False, e)
+
+
 def post(url, data, headers):
     out = '{}'
     try:
@@ -176,15 +203,29 @@ def get_success_pure(url, data, headers):
     assert(code == 200), 'expected 200'
     return msg
 
-def post_success(url, data, headers, print_f=None):
+def post_success(url, data, headers=None, print_f=None):
     (code, msg) = post(url, data, headers)
     if print_f:
         print_f(code, msg)
     assert(code == 200), 'expected 200'
     result = get_result(msg)
     return result
 
-def post_success_pure(url, data, headers):
+def post_form_success(url, data, headers=None, print_f=None):
+    (code, msg) = post_form(url, data, headers)
+    if print_f:
+        print_f(code, msg)
+    assert(code == 200), 'expected 200'
+    return msg
+
+def post_form_ec500(url, data, headers=None, print_f=None):
+    (code, msg) = post_form(url, data, headers)
+    if print_f:
+        print_f(code, msg)
+    assert(code == 500), 'expected 500'
+    return msg
+
+def post_success_pure(url, data, headers=None):
     (code, msg) = post(url, data, headers)
     assert(code == 200), 'expected 200'
     return msg

test/test.lua

@@ -1,3 +1,5 @@
+#!/usr/bin/env tarantool
+
 json = require('json')
 yaml = require('yaml')
 os   = require('os')

test/v24_features.py

@@ -47,3 +47,35 @@
 result = result[0]
 assert(result['args']['a'] == arg_a), 'does not expected (args.a)'
 
+# ============
+#
+print('[+] Post form')
+preset_method_location = BASE_URL + '/form'
+data = { 'a':'b', 'b':'c', 'c':'d'}
+result = get_result(post_form_success(preset_method_location, data))
+assert(result[0]['body'] == urllib.urlencode(data)), 'result does not match'
+# ============
+#
+print('[+] Post large form')
+preset_method_location = BASE_URL + '/form_large'
+for i in range(1000):
+    key = 'a' + str(i)
+    data[key] = 'b'
+result = get_result(post_form_success(preset_method_location, data))
+assert(result[0]['body'] == urllib.urlencode(data)), "result does not matched"
+
+# ============
+#
+print('[+] Post empty form')
+preset_method_location = BASE_URL + '/form_nothing'
+result = get_result(post_form_success(preset_method_location, {}))
+assert(not 'body' in result[0]), "result contains 'body'"
+
+# ============
+#
+print('[+] Post overflow form')
+preset_method_location = BASE_URL + '/form_large'
+for i in range(100000):
+    key = 'a' + str(i)
+    data[key] = 'b'
+post_form_ec500(preset_method_location, data, None, default_print_f)