Skip to content

Commit c5b53fb

Browse files
GUIGUI
committed
Make require statements in tests consistent.
Since we install the luarock before running tests, we can rely on the normal include path when requiring auto-ssl (rather than the relative path to the "lib" directory). This better ensures we're always testing the version of auto-ssl that would be installed by the luarock.
1 parent e90699c commit c5b53fb

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

‎t/file.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ __DATA__
2323
lua_shared_dict auto_ssl_settings 64k;
2424
2525
init_by_lua_block {
26-
auto_ssl = (require "lib.resty.auto-ssl").new({
26+
auto_ssl = (require "resty.auto-ssl").new({
2727
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
2828
ca = "https://acme-staging.api.letsencrypt.org/directory",
2929
storage_adapter = "resty.auto-ssl.storage_adapters.file",
@@ -148,7 +148,7 @@ auto-ssl: issuing new certificate for
148148
lua_shared_dict auto_ssl_settings 64k;
149149
150150
init_by_lua_block {
151-
auto_ssl = (require "lib.resty.auto-ssl").new({
151+
auto_ssl = (require "resty.auto-ssl").new({
152152
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
153153
ca = "https://acme-staging.api.letsencrypt.org/directory",
154154
storage_adapter = "resty.auto-ssl.storage_adapters.file",

‎t/hook_secret.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ __DATA__
2121
lua_shared_dict auto_ssl 1m;
2222
2323
init_by_lua_block {
24-
auto_ssl = (require "lib.resty.auto-ssl").new({
24+
auto_ssl = (require "resty.auto-ssl").new({
2525
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
2626
ca = "https://acme-staging.api.letsencrypt.org/directory",
2727
})
@@ -47,7 +47,7 @@ auto-ssl: dict auto_ssl_settings could not be found. Please add it to your confi
4747
lua_shared_dict auto_ssl_settings 64k;
4848
4949
init_by_lua_block {
50-
auto_ssl = (require "lib.resty.auto-ssl").new({
50+
auto_ssl = (require "resty.auto-ssl").new({
5151
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
5252
ca = "https://acme-staging.api.letsencrypt.org/directory",
5353
})

‎t/memory.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ __DATA__
2222
lua_shared_dict auto_ssl_settings 64k;
2323
2424
init_by_lua_block {
25-
auto_ssl = (require "lib.resty.auto-ssl").new({
25+
auto_ssl = (require "resty.auto-ssl").new({
2626
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
2727
ca = "https://acme-staging.api.letsencrypt.org/directory",
2828
allow_domain = function(domain)
@@ -131,7 +131,7 @@ auto-ssl: issuing new certificate for
131131
lua_shared_dict auto_ssl_settings 64k;
132132
133133
init_by_lua_block {
134-
auto_ssl = (require "lib.resty.auto-ssl").new({
134+
auto_ssl = (require "resty.auto-ssl").new({
135135
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
136136
ca = "https://acme-staging.api.letsencrypt.org/directory",
137137
allow_domain = function(domain)

‎t/multiple_workers.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $TEST_NGINX_USER
4242
lua_shared_dict test_counts 128k;
4343
4444
init_by_lua_block {
45-
auto_ssl = (require "lib.resty.auto-ssl").new({
45+
auto_ssl = (require "resty.auto-ssl").new({
4646
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
4747
ca = "https://acme-staging.api.letsencrypt.org/directory",
4848
allow_domain = function(domain)

‎t/redis.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ __DATA__
2929
lua_shared_dict auto_ssl_settings 64k;
3030
3131
init_by_lua_block {
32-
auto_ssl = (require "lib.resty.auto-ssl").new({
32+
auto_ssl = (require "resty.auto-ssl").new({
3333
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
3434
ca = "https://acme-staging.api.letsencrypt.org/directory",
3535
storage_adapter = "resty.auto-ssl.storage_adapters.redis",
@@ -162,7 +162,7 @@ auto-ssl: issuing new certificate for
162162
lua_shared_dict auto_ssl_settings 64k;
163163
164164
init_by_lua_block {
165-
auto_ssl = (require "lib.resty.auto-ssl").new({
165+
auto_ssl = (require "resty.auto-ssl").new({
166166
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
167167
ca = "https://acme-staging.api.letsencrypt.org/directory",
168168
storage_adapter = "resty.auto-ssl.storage_adapters.redis",
@@ -292,7 +292,7 @@ issuing new certificate for
292292
lua_shared_dict auto_ssl_settings 64k;
293293
294294
init_by_lua_block {
295-
auto_ssl = (require "lib.resty.auto-ssl").new({
295+
auto_ssl = (require "resty.auto-ssl").new({
296296
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
297297
ca = "https://acme-staging.api.letsencrypt.org/directory",
298298
storage_adapter = "resty.auto-ssl.storage_adapters.redis",
@@ -426,7 +426,7 @@ dehydrated succeeded, but certs still missing from storage
426426
lua_shared_dict auto_ssl_settings 64k;
427427
428428
init_by_lua_block {
429-
auto_ssl = (require "lib.resty.auto-ssl").new({
429+
auto_ssl = (require "resty.auto-ssl").new({
430430
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
431431
ca = "https://acme-staging.api.letsencrypt.org/directory",
432432
storage_adapter = "resty.auto-ssl.storage_adapters.redis",

‎t/sanity.t

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ __DATA__
2323
lua_shared_dict auto_ssl_settings 64k;
2424
2525
init_by_lua_block {
26-
auto_ssl = (require "lib.resty.auto-ssl").new({
26+
auto_ssl = (require "resty.auto-ssl").new({
2727
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
2828
ca = "https://acme-staging.api.letsencrypt.org/directory",
2929
allow_domain = function(domain)
@@ -136,7 +136,7 @@ auto-ssl: issuing new certificate for
136136
lua_shared_dict auto_ssl_settings 64k;
137137
138138
init_by_lua_block {
139-
auto_ssl = (require "lib.resty.auto-ssl").new({
139+
auto_ssl = (require "resty.auto-ssl").new({
140140
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
141141
ca = "https://acme-staging.api.letsencrypt.org/directory",
142142
allow_domain = function(domain)
@@ -249,7 +249,7 @@ issuing new certificate for
249249
lua_shared_dict auto_ssl_settings 64k;
250250
251251
init_by_lua_block {
252-
auto_ssl = (require "lib.resty.auto-ssl").new({
252+
auto_ssl = (require "resty.auto-ssl").new({
253253
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
254254
ca = "https://acme-staging.api.letsencrypt.org/directory",
255255
allow_domain = function(domain)
@@ -356,7 +356,7 @@ lua ssl certificate verify error: (18: self signed certificate)
356356
lua_shared_dict auto_ssl_settings 64k;
357357
358358
init_by_lua_block {
359-
auto_ssl = (require "lib.resty.auto-ssl").new({
359+
auto_ssl = (require "resty.auto-ssl").new({
360360
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
361361
ca = "https://acme-staging.api.letsencrypt.org/directory",
362362
})
@@ -460,7 +460,7 @@ lua ssl certificate verify error: (18: self signed certificate)
460460
lua_shared_dict auto_ssl_settings 64k;
461461
462462
init_by_lua_block {
463-
auto_ssl = (require "lib.resty.auto-ssl").new({
463+
auto_ssl = (require "resty.auto-ssl").new({
464464
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
465465
ca = "https://acme-staging.api.letsencrypt.org/directory",
466466
allow_domain = function(domain)
@@ -573,7 +573,7 @@ lua ssl certificate verify error: (18: self signed certificate)
573573
lua_shared_dict auto_ssl_settings 64k;
574574
575575
init_by_lua_block {
576-
auto_ssl = (require "lib.resty.auto-ssl").new()
576+
auto_ssl = (require "resty.auto-ssl").new()
577577
auto_ssl:set("dir", "$TEST_NGINX_RESTY_AUTO_SSL_DIR")
578578
auto_ssl:set("ca", "https://acme-staging.api.letsencrypt.org/directory")
579579
auto_ssl:set("allow_domain", function(domain)
@@ -685,7 +685,7 @@ lua ssl certificate verify error: (18: self signed certificate)
685685
lua_shared_dict auto_ssl_settings 64k;
686686
687687
init_by_lua_block {
688-
auto_ssl = (require "lib.resty.auto-ssl").new({
688+
auto_ssl = (require "resty.auto-ssl").new({
689689
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
690690
ca = "https://acme-staging.api.letsencrypt.org/directory",
691691
allow_domain = function(domain)
@@ -794,7 +794,7 @@ lua ssl certificate verify error: (18: self signed certificate)
794794
lua_shared_dict auto_ssl_settings 64k;
795795
796796
init_by_lua_block {
797-
auto_ssl = (require "lib.resty.auto-ssl").new({
797+
auto_ssl = (require "resty.auto-ssl").new({
798798
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
799799
ca = "https://acme-staging.api.letsencrypt.org/directory",
800800
allow_domain = function(domain)
@@ -903,7 +903,7 @@ lua ssl certificate verify error: (18: self signed certificate)
903903
lua_shared_dict auto_ssl_settings 64k;
904904
905905
init_by_lua_block {
906-
auto_ssl = (require "lib.resty.auto-ssl").new({
906+
auto_ssl = (require "resty.auto-ssl").new({
907907
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
908908
ca = "https://acme-staging.api.letsencrypt.org/directory",
909909
request_domain = function(ssl, ssl_options)
@@ -1063,7 +1063,7 @@ lua ssl certificate verify error: (18: self signed certificate)
10631063
lua_shared_dict auto_ssl_settings 64k;
10641064
10651065
init_by_lua_block {
1066-
auto_ssl = (require "lib.resty.auto-ssl").new({
1066+
auto_ssl = (require "resty.auto-ssl").new({
10671067
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
10681068
ca = "https://acme-staging.api.letsencrypt.org/directory",
10691069
allow_domain = function(domain)
@@ -1184,7 +1184,7 @@ auto-ssl: dehydrated succeeded, but certs still missing from storage - trying to
11841184
lua_shared_dict auto_ssl_settings 64k;
11851185
11861186
init_by_lua_block {
1187-
auto_ssl = (require "lib.resty.auto-ssl").new({
1187+
auto_ssl = (require "resty.auto-ssl").new({
11881188
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
11891189
hook_server_port = 9888,
11901190
ca = "https://acme-staging.api.letsencrypt.org/directory",

‎t/worker_file_permissions.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ user $TEST_NGINX_NOBODY_USER $TEST_NGINX_NOBODY_GROUP;
3131
lua_shared_dict auto_ssl_settings 64k;
3232
3333
init_by_lua_block {
34-
auto_ssl = (require "lib.resty.auto-ssl").new({
34+
auto_ssl = (require "resty.auto-ssl").new({
3535
dir = "$TEST_NGINX_RESTY_AUTO_SSL_DIR",
3636
ca = "https://acme-staging.api.letsencrypt.org/directory",
3737
storage_adapter = "resty.auto-ssl.storage_adapters.file",

0 commit comments

Comments
 (0)