Skip to content

Commit 7864121

Browse files
oliveromahonyoliveromahony
committed
tests
1 parent 092949b commit 7864121

File tree

3 files changed

+202
-5
lines changed

3 files changed

+202
-5
lines changed

‎parse_test.go

+75-5
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,12 @@ var parseFixtures = []parseFixture{
18581858
Directive: "server",
18591859
Line: 2,
18601860
Args: []string{},
1861-
Block: Directives{
1862-
// TODO
1861+
Block: Directives{
1862+
{
1863+
Directive: "ssl_certificate_by_lua_block",
1864+
Line: 3,
1865+
Args: []string{"\n print(\"Test lua ssl certificate!\")\n "},
1866+
},
18631867
},
18641868
},
18651869
},
@@ -1880,8 +1884,9 @@ var parseFixtures = []parseFixture{
18801884
Errors: []PayloadError{},
18811885
Config: []Config{
18821886
{
1883-
File: getTestConfigPath("lua-block-cert-double-server", "nginx.conf"),
1887+
File: "testdata/configs/lua-block-cert-double-server/nginx.conf",
18841888
Status: "ok",
1889+
Errors: []ConfigError{},
18851890
Parsed: Directives{
18861891
{
18871892
Directive: "http",
@@ -1892,10 +1897,75 @@ var parseFixtures = []parseFixture{
18921897
Directive: "server",
18931898
Line: 2,
18941899
Args: []string{},
1895-
Block: Directives{
1896-
// TODO
1900+
Block: Directives{
1901+
{
1902+
Directive: "listen",
1903+
Line: 3,
1904+
Args: []string{"443", "ssl"},
1905+
},
1906+
{
1907+
Directive: "server_name",
1908+
Line: 4,
1909+
Args: []string{"lua.example.com"},
1910+
},
1911+
{
1912+
Directive: "location",
1913+
Line: 6,
1914+
Args: []string{"/"},
1915+
Block: Directives{
1916+
{
1917+
Directive: "root",
1918+
Line: 7,
1919+
Args: []string{"/usr/share/nginx/html"},
1920+
},
1921+
{
1922+
Directive: "index",
1923+
Line: 8,
1924+
Args: []string{"index.html", "index.htm"},
1925+
},
1926+
},
1927+
},
1928+
{
1929+
Directive: "error_page",
1930+
Line: 11,
1931+
Args: []string{"500", "502", "503", "504", "/50x.html"},
1932+
},
1933+
{
1934+
Directive: "location",
1935+
Line: 12,
1936+
Args: []string{"=", "/50x.html"},
1937+
Block: Directives{
1938+
{
1939+
Directive: "root",
1940+
Line: 13,
1941+
Args: []string{"/usr/share/nginx/html"},
1942+
},
1943+
},
1944+
},
1945+
{
1946+
Directive: "ssl_certificate",
1947+
Line: 16,
1948+
Args: []string{"/etc/nginx/ssl/cert1.crt"},
1949+
},
1950+
{
1951+
Directive: "ssl_certificate_key",
1952+
Line: 17,
1953+
Args: []string{"/etc/nginx/ssl/key1.key"},
1954+
},
1955+
{
1956+
Directive: "ssl_certificate_by_lua_block",
1957+
Line: 19,
1958+
Args: []string{
1959+
"\n print(\"Test lua ssl certificate!\")\n ",
1960+
},
1961+
},
18971962
},
18981963
},
1964+
{
1965+
Directive: "server",
1966+
Line: 24,
1967+
Args: []string{},
1968+
},
18991969
},
19001970
},
19011971
},

‎testdata/configs/lua-block-cert-double-server/nginx.json

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"status": "ok",
3+
"errors": [],
4+
"config": [
5+
{
6+
"file": "testdata/configs/lua-block-cert-double-server/nginx.conf",
7+
"status": "ok",
8+
"errors": [],
9+
"parsed": [
10+
{
11+
"directive": "http",
12+
"line": 1,
13+
"args": [],
14+
"block": [
15+
{
16+
"directive": "server",
17+
"line": 2,
18+
"args": [],
19+
"block": [
20+
{
21+
"directive": "listen",
22+
"line": 3,
23+
"args": ["443", "ssl"]
24+
},
25+
{
26+
"directive": "server_name",
27+
"line": 4,
28+
"args": ["lua.example.com"]
29+
},
30+
{
31+
"directive": "location",
32+
"line": 6,
33+
"args": ["/"],
34+
"block": [
35+
{
36+
"directive": "root",
37+
"line": 7,
38+
"args": ["/usr/share/nginx/html"]
39+
},
40+
{
41+
"directive": "index",
42+
"line": 8,
43+
"args": ["index.html", "index.htm"]
44+
}
45+
]
46+
},
47+
{
48+
"directive": "error_page",
49+
"line": 11,
50+
"args": ["500", "502", "503", "504", "/50x.html"]
51+
},
52+
{
53+
"directive": "location",
54+
"line": 12,
55+
"args": ["=", "/50x.html"],
56+
"block": [
57+
{
58+
"directive": "root",
59+
"line": 13,
60+
"args": ["/usr/share/nginx/html"]
61+
}
62+
]
63+
},
64+
{
65+
"directive": "ssl_certificate",
66+
"line": 16,
67+
"args": ["/etc/nginx/ssl/cert1.crt"]
68+
},
69+
{
70+
"directive": "ssl_certificate_key",
71+
"line": 17,
72+
"args": ["/etc/nginx/ssl/key1.key"]
73+
},
74+
{
75+
"directive": "ssl_certificate_by_lua_block",
76+
"line": 19,
77+
"args": [
78+
"\n print(\"Test lua ssl certificate!\")\n "
79+
]
80+
}
81+
]
82+
},
83+
{
84+
"directive": "server",
85+
"line": 24,
86+
"args": []
87+
}
88+
]
89+
}
90+
]
91+
}
92+
]
93+
}

‎testdata/configs/lua-block-cert-slim/nginx.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"status": "ok",
3+
"errors": [],
4+
"config": [
5+
{
6+
"file": "testdata/configs/lua-block-cert-slim/nginx.conf",
7+
"status": "ok",
8+
"errors": [],
9+
"parsed": [
10+
{
11+
"directive": "http",
12+
"line": 1,
13+
"args": [],
14+
"block": [
15+
{
16+
"directive": "server",
17+
"line": 2,
18+
"args": [],
19+
"block": [
20+
{
21+
"directive": "ssl_certificate_by_lua_block",
22+
"line": 3,
23+
"args": [
24+
"\n print(\"Test lua ssl certificate!\")\n "
25+
]
26+
}
27+
]
28+
}
29+
]
30+
}
31+
]
32+
}
33+
]
34+
}

0 commit comments

Comments
 (0)