Skip to content

Commit 2c6e174

Browse files
committed
Start test server with ladle when in apacheds test env only
1 parent 19d2fb9 commit 2c6e174

File tree

1 file changed

+32
-8
lines changed

1 file changed

+32
-8
lines changed

test/test_helper.rb

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,57 @@
1313
require 'minitest/autorun'
1414

1515
class GitHub::Ldap::Test < Minitest::Test
16+
def self.test_env
17+
ENV['TESTENV'] || "apacheds"
18+
end
19+
1620
def self.run(reporter, options = {})
1721
start_server
1822
super
1923
stop_server
2024
end
2125

2226
def self.stop_server
23-
GitHub::Ldap.stop_server
27+
if test_env == "apacheds"
28+
GitHub::Ldap.stop_server
29+
end
2430
end
2531

2632
def self.start_server
27-
server_opts = respond_to?(:test_server_options) ? test_server_options : {}
28-
GitHub::Ldap.start_server(server_opts)
33+
if test_env == "apacheds"
34+
server_opts = respond_to?(:test_server_options) ? test_server_options : {}
35+
GitHub::Ldap.start_server(server_opts)
36+
end
2937
end
3038

3139
def options
3240
@service = MockInstrumentationService.new
33-
@options ||= GitHub::Ldap.server_options.merge \
34-
host: 'localhost',
35-
uid: 'uid',
36-
:instrumentation_service => @service
41+
@options ||=
42+
case self.class.test_env
43+
when "apacheds"
44+
GitHub::Ldap.server_options.merge \
45+
host: 'localhost',
46+
uid: 'uid',
47+
instrumentation_service: @service
48+
when "openldap"
49+
{
50+
host: 'localhost',
51+
port: 389
52+
admin_user: 'uid=admin,dc=github,dc=com',
53+
admin_password: 'passworD1',
54+
search_domains: %w(dc=github,dc=com),
55+
uid: 'uid',
56+
instrumentation_service: @service
57+
}
58+
end
3759
end
3860
end
3961

4062
class GitHub::Ldap::UnauthenticatedTest < GitHub::Ldap::Test
4163
def self.start_server
42-
GitHub::Ldap.start_server(:allow_anonymous => true)
64+
if test_env == "apacheds"
65+
GitHub::Ldap.start_server(:allow_anonymous => true)
66+
end
4367
end
4468

4569
def options

0 commit comments

Comments
 (0)