Close the connection only if we establish it. (#18897)
This commit is contained in:
@@ -85,13 +85,12 @@ func (multiples *MultiLDAP) Ping() ([]*ServerStatus, error) {
|
||||
if err == nil {
|
||||
status.Available = true
|
||||
serverStatuses = append(serverStatuses, status)
|
||||
server.Close()
|
||||
} else {
|
||||
status.Available = false
|
||||
status.Error = err
|
||||
serverStatuses = append(serverStatuses, status)
|
||||
}
|
||||
|
||||
defer server.Close()
|
||||
}
|
||||
|
||||
return serverStatuses, nil
|
||||
|
||||
@@ -40,11 +40,12 @@ func TestMultiLDAP(t *testing.T) {
|
||||
So(statuses[0].Port, ShouldEqual, 361)
|
||||
So(statuses[0].Available, ShouldBeFalse)
|
||||
So(statuses[0].Error, ShouldEqual, expectedErr)
|
||||
So(mock.closeCalledTimes, ShouldEqual, 0)
|
||||
|
||||
teardown()
|
||||
})
|
||||
Convey("Shoudl get the LDAP server statuses", func() {
|
||||
setup()
|
||||
Convey("Should get the LDAP server statuses", func() {
|
||||
mock := setup()
|
||||
|
||||
multi := New([]*ldap.ServerConfig{
|
||||
{Host: "10.0.0.1", Port: 361},
|
||||
@@ -57,6 +58,7 @@ func TestMultiLDAP(t *testing.T) {
|
||||
So(statuses[0].Port, ShouldEqual, 361)
|
||||
So(statuses[0].Available, ShouldBeTrue)
|
||||
So(statuses[0].Error, ShouldBeNil)
|
||||
So(mock.closeCalledTimes, ShouldEqual, 1)
|
||||
|
||||
teardown()
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user