use block directives

Author: pintsized

t/sentinel.t

@@ -21,30 +21,30 @@ __DATA__
 === TEST 1: Get the master
 --- http_config eval: $::HttpConfig
 --- config
-    location /t {
-        content_by_lua '
-            local redis_connector = require "resty.redis.connector"
-            local rc = redis_connector.new()
-
-            local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
-            if not sentinel then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local redis_sentinel = require "resty.redis.sentinel"
-
-            local master, err = redis_sentinel.get_master(sentinel, "mymaster")
-            if not master then
-                ngx.say(err)
-            else
-                ngx.say("host: ", master.host)
-                ngx.say("port: ", master.port)
-            end
-
-            sentinel:close()
-        ';
-    }
+location /t {
+    content_by_lua_block {
+        local redis_connector = require "resty.redis.connector"
+        local rc = redis_connector.new()
+
+        local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
+        if not sentinel then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        local redis_sentinel = require "resty.redis.sentinel"
+
+        local master, err = redis_sentinel.get_master(sentinel, "mymaster")
+        if not master then
+            ngx.say(err)
+        else
+            ngx.say("host: ", master.host)
+            ngx.say("port: ", master.port)
+        end
+
+        sentinel:close()
+        }
+}
 --- request
     GET /t
 --- response_body
@@ -57,37 +57,37 @@ port: 6379
 === TEST 2: Get slaves
 --- http_config eval: $::HttpConfig
 --- config
-    location /t {
-        content_by_lua '
-            local redis_connector = require "resty.redis.connector"
-            local rc = redis_connector.new()
-
-            local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
-            if not sentinel then
-                ngx.say("failed to connect: ", err)
-                return
+location /t {
+    content_by_lua_block {
+        local redis_connector = require "resty.redis.connector"
+        local rc = redis_connector.new()
+
+        local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
+        if not sentinel then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        local redis_sentinel = require "resty.redis.sentinel"
+
+        local slaves, err = redis_sentinel.get_slaves(sentinel, "mymaster")
+        if not slaves then
+            ngx.say(err)
+        else
+            -- order is undefined
+            local all = {}
+            for i,slave in ipairs(slaves) do
+                all[i] = tonumber(slave.port)
             end
-
-            local redis_sentinel = require "resty.redis.sentinel"
-
-            local slaves, err = redis_sentinel.get_slaves(sentinel, "mymaster")
-            if not slaves then
-                ngx.say(err)
-            else
-                -- order is undefined
-                local all = {}
-                for i,slave in ipairs(slaves) do
-                    all[i] = tonumber(slave.port)
-                end
-                table.sort(all)
-                for _,p in ipairs(all) do
-                    ngx.say(p)
-                end
+            table.sort(all)
+            for _,p in ipairs(all) do
+                ngx.say(p)
             end
+        end
 
-            sentinel:close()
-        ';
+        sentinel:close()
     }
+}
 --- request
     GET /t
 --- response_body
@@ -99,40 +99,39 @@ port: 6379
 === TEST 3: Get only healthy slaves
 --- http_config eval: $::HttpConfig
 --- config
-    location /t {
-        content_by_lua '
-
-            local redis = require "resty.redis"
-            local r = redis.new()
-            r:connect("127.0.0.1", 6378)
-            r:slaveof("127.0.0.1", 7000)
-
-            ngx.sleep(9)
-
-            local redis_connector = require "resty.redis.connector"
-            local rc = redis_connector.new()
-
-            local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
-            if not sentinel then
-                ngx.say("failed to connect: ", err)
-                return
-            end
-
-            local redis_sentinel = require "resty.redis.sentinel"
-
-            local slaves, err = redis_sentinel.get_slaves(sentinel, "mymaster")
-            if not slaves then
-                ngx.say(err)
-            else
-                for _,slave in ipairs(slaves) do
-                    ngx.say("host: ", slave.host)
-                    ngx.say("port: ", slave.port)
-                end
+location /t {
+    content_by_lua_block {
+        local redis = require "resty.redis"
+        local r = redis.new()
+        r:connect("127.0.0.1", 6378)
+        r:slaveof("127.0.0.1", 7000)
+
+        ngx.sleep(9)
+
+        local redis_connector = require "resty.redis.connector"
+        local rc = redis_connector.new()
+
+        local sentinel, err = rc:connect{ url = "redis://127.0.0.1:6381" }
+        if not sentinel then
+            ngx.say("failed to connect: ", err)
+            return
+        end
+
+        local redis_sentinel = require "resty.redis.sentinel"
+
+        local slaves, err = redis_sentinel.get_slaves(sentinel, "mymaster")
+        if not slaves then
+            ngx.say(err)
+        else
+            for _,slave in ipairs(slaves) do
+                ngx.say("host: ", slave.host)
+                ngx.say("port: ", slave.port)
             end
+        end
 
-            sentinel:close()
-        ';
+        sentinel:close()
     }
+}
 --- request
     GET /t
 --- timeout: 10