Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
5d503723
Commit
5d503723
authored
4 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-573
: use default ldap config port
parent
8b7f56b8
No related branches found
No related tags found
1 merge request
!343
Resolve TMSS-557 and TMSS-307
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/test/ldap_test_service.py
+2
-2
2 additions, 2 deletions
SAS/TMSS/backend/test/ldap_test_service.py
with
2 additions
and
2 deletions
SAS/TMSS/backend/test/ldap_test_service.py
+
2
−
2
View file @
5d503723
...
@@ -5,7 +5,7 @@ logger = logging.getLogger(__name__)
...
@@ -5,7 +5,7 @@ logger = logging.getLogger(__name__)
logging_already_configured
=
len
(
logging
.
root
.
handlers
)
>
0
logging_already_configured
=
len
(
logging
.
root
.
handlers
)
>
0
from
ldap_test
import
LdapServer
from
ldap_test
import
LdapServer
from
ldap_test.server
import
DEFAULT_GATEWAY_PORT
,
DEFAULT_PYTHON_PROXY_PORT
from
ldap_test.server
import
DEFAULT_GATEWAY_PORT
,
DEFAULT_PYTHON_PROXY_PORT
,
DEFAULT_CONFIG
from
py4j.java_gateway
import
Py4JNetworkError
from
py4j.java_gateway
import
Py4JNetworkError
from
datetime
import
datetime
,
timedelta
from
datetime
import
datetime
,
timedelta
...
@@ -63,7 +63,7 @@ class TestLDAPServer():
...
@@ -63,7 +63,7 @@ class TestLDAPServer():
with
self
.
_named_lock
:
with
self
.
_named_lock
:
self
.
_tmp_creds
.
dbcreds
.
type
=
'
LDAP
'
self
.
_tmp_creds
.
dbcreds
.
type
=
'
LDAP
'
self
.
_tmp_creds
.
dbcreds
.
host
=
'
127.0.0.1
'
self
.
_tmp_creds
.
dbcreds
.
host
=
'
127.0.0.1
'
self
.
_tmp_creds
.
dbcreds
.
port
=
find_free_port
()
self
.
_tmp_creds
.
dbcreds
.
port
=
find_free_port
(
DEFAULT_CONFIG
.
get
(
'
port
'
)
)
self
.
_tmp_creds
.
create
()
self
.
_tmp_creds
.
create
()
logger
.
info
(
"
Using dbcreds
'
%s
'
to start and configure LDAP server: %s
"
,
logger
.
info
(
"
Using dbcreds
'
%s
'
to start and configure LDAP server: %s
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment