[commits] Horde branch master updated. f15a28ecc638daece7dafaf4b190e463ff52b655

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 9dc07f0feada8ebe3ccb7a184454b0605ef8c1b2

fe681e5 Fix resp. disable tests.
8881832 [jan] Don't report hooks loading as successful.
f15a28e Fix unit tests.

Summary: http://github.com/horde/horde/compare/9dc07f0feada8ebe3ccb7a184454b0605ef8c1b2...f15a28ecc638daece7dafaf4b190e463ff52b655

-----------------------------------------------------------------------

commit fe681e57d67519583309d86a90d6d44f6d34f78a
Author: Jan Schneider <jan at horde.org>
Date:   Fri Sep 5 17:45:07 2014 +0200

    Fix resp. disable tests.

 passwd/test/Passwd/TestCase.php                |   18 ++++++++++++++++++
 passwd/test/Passwd/Unit/Driver/SqlTest.php     |   20 +++++++-------------
 passwd/test/Passwd/Unit/Factory/DriverTest.php |    1 +
 3 files changed, 26 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/fe681e57d67519583309d86a90d6d44f6d34f78a

-----------------------------------------------------------------------

commit 8881832869d647c7bf32e6a6179e755fd1116635
Author: Jan Schneider <jan at horde.org>
Date:   Fri Sep 5 17:53:06 2014 +0200

    [jan] Don't report hooks loading as successful.

 framework/Test/lib/Horde/Test/Stub/Registry.php |    4 ++++
 framework/Test/package.xml                      |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/8881832869d647c7bf32e6a6179e755fd1116635

-----------------------------------------------------------------------

commit f15a28ecc638daece7dafaf4b190e463ff52b655
Author: Jan Schneider <jan at horde.org>
Date:   Fri Sep 5 17:01:18 2014 +0200

    Fix unit tests.
    
    Conflicts:
    	turba/package.xml

 turba/package.xml                       |   10 +++-
 turba/test/Turba/Unit/ExportTest.php    |  105 +++----------------------------
 turba/test/Turba/fixtures/bug_9207.vcf  |   28 ++++++++
 turba/test/Turba/fixtures/export_21.vcf |   27 ++++++++
 turba/test/Turba/fixtures/export_30.vcf |   28 ++++++++
 5 files changed, 99 insertions(+), 99 deletions(-)
 create mode 100644 turba/test/Turba/fixtures/bug_9207.vcf
 create mode 100644 turba/test/Turba/fixtures/export_21.vcf
 create mode 100644 turba/test/Turba/fixtures/export_30.vcf

http://github.com/horde/horde/commit/f15a28ecc638daece7dafaf4b190e463ff52b655