Backport of LDAP second display name #22250

Merged
merged 2 commits into from Feb 9, 2016

Projects

None yet

5 participants

@PVince81
Collaborator
PVince81 commented Feb 9, 2016

From c1871f5

@blizzz @PVince81 blizzz Backport of LDAP second display name
From c1871f5
b858550
@PVince81
Collaborator
PVince81 commented Feb 9, 2016

Please review @blizzz @MorrisJobke @scolebrook

I did a quick test locally using the "uidNumber" as second attribute and it worked fine!

@PVince81 PVince81 added this to the 8.2.3-current-maintenance milestone Feb 9, 2016
@karlitschek
Member

backport is ok 👍

@MorrisJobke
Member

Tested and works 👍

@MorrisJobke
Member

@blizzz Could you have a look at the failing unit tests:


1) OCA\user_ldap\tests\Test_User_User::testComposeAndStoreDisplayName with data set #0 ('Roland Deschain', '', 'Roland Deschain')
Undefined offset: 7

/ssd/jenkins/workspace/core-ci-linux/database/sqlite/label/SLAVE/apps/user_ldap/tests/user/user.php:895

2) OCA\user_ldap\tests\Test_User_User::testComposeAndStoreDisplayName with data set #1 ('Roland Deschain', null, 'Roland Deschain')
Undefined offset: 7

/ssd/jenkins/workspace/core-ci-linux/database/sqlite/label/SLAVE/apps/user_ldap/tests/user/user.php:895

3) OCA\user_ldap\tests\Test_User_User::testComposeAndStoreDisplayName with data set #2 ('Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@d...r.com)')
Undefined offset: 7

/ssd/jenkins/workspace/core-ci-linux/database/sqlite/label/SLAVE/apps/user_ldap/tests/user/user.php:895
@blizzz
Contributor
blizzz commented Feb 9, 2016

@blizzz Could you have a look at the failing unit tests:

this second, literally

@blizzz blizzz adjust test
eedf9a6
@blizzz
Contributor
blizzz commented Feb 9, 2016

now we shall pass

Also, works 👍

@PVince81 PVince81 merged commit 3350d62 into stable8.2 Feb 9, 2016

7 checks passed

core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #57891 succeeded in 7 min 43 sec
Details
ocs-api-integration-tests-ci Build #7262 succeeded in 39 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #7036 succeeded in 2 min 14 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #7036 succeeded in 1 min 40 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #7036 succeeded in 5 min 17 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #7275 succeeded in 2 min 31 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #34564 succeeded in 7 min 38 sec
Details
@PVince81 PVince81 deleted the stable8.2-ldap_2nddispname branch Feb 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment