Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ac
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
OATS-CADC
ac
Commits
60bf4a9f
Commit
60bf4a9f
authored
8 years ago
by
Brian Major
Browse files
Options
Downloads
Patches
Plain Diff
s1965 - reversed exception catching order
parent
8d2419fd
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
+5
-6
5 additions, 6 deletions
.../java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
with
5 additions
and
6 deletions
cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
+
5
−
6
View file @
60bf4a9f
...
...
@@ -137,19 +137,18 @@ public class AbstractLdapDAOTest
{
config
=
getLdapConfig
();
}
catch
(
Runtime
Exception
e
)
catch
(
NoSuchElement
Exception
e
)
{
log
.
warn
(
"Skipping integration test: no ~/.dbrc file"
);
log
.
warn
(
"Skipping integration test: no
entry in
~/.dbrc file"
);
org
.
junit
.
Assume
.
assumeTrue
(
false
);
return
;
}
catch
(
NoSuchElement
Exception
e
)
catch
(
Runtime
Exception
e
)
{
log
.
warn
(
"Skipping integration test: no
entry in
~/.dbrc file"
);
log
.
warn
(
"Skipping integration test: no ~/.dbrc file"
);
org
.
junit
.
Assume
.
assumeTrue
(
false
);
return
;
}
cadcDaoTest1_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest1_CN
);
cadcDaoTest2_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest2_CN
);
cadcDaoTest3_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest3_CN
);
...
...
@@ -239,7 +238,7 @@ public class AbstractLdapDAOTest
return
new
LdapUserDAO
(
connections
);
}
static
protected
LdapConfig
getLdapConfig
()
static
protected
LdapConfig
getLdapConfig
()
throws
Exception
{
return
LdapConfig
.
loadLdapConfig
(
CONFIG
);
}
...
...
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