From b411ecedc0bf947ea1489d6a96a0fcd3dfefc4de Mon Sep 17 00:00:00 2001 From: Matvey Aksenov Date: Tue, 27 Dec 2016 17:02:07 +0000 Subject: [PATCH] Actually run the test-suites. Close #7. --- .travis.yml | 12 ++++++------ test/Ldap/Client/BindSpec.hs | 2 +- test/Ldap/Client/SearchSpec.hs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1b146e..946ab60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,15 @@ sudo: false matrix: include: - - env: CABALVER=1.16 GHCVER=7.6.3 + - env: CABALVER=1.16 GHCVER=7.6.3 RUN_TESTS= addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} - - env: CABALVER=1.18 GHCVER=7.8.4 + - env: CABALVER=1.18 GHCVER=7.8.4 RUN_TESTS= addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} - - env: CABALVER=1.22 GHCVER=7.10.3 + - env: CABALVER=1.22 GHCVER=7.10.3 RUN_TESTS=--run-tests addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}} - - env: CABALVER=1.24 GHCVER=8.0.1 + - env: CABALVER=1.24 GHCVER=8.0.1 RUN_TESTS=--run-tests addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],sources: [hvr-ghc]}} - - env: CABALVER=head GHCVER=head + - env: CABALVER=head GHCVER=head RUN_TESTS=--run-tests addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} allow_failures: @@ -29,5 +29,5 @@ install: - npm install ldapjs script: - - cabal install --enable-tests ldap-client.cabal + - cabal install --enable-tests $RUN_TESTS ldap-client.cabal - cabal sdist && cabal install --enable-tests dist/ldap-client-*.tar.gz diff --git a/test/Ldap/Client/BindSpec.hs b/test/Ldap/Client/BindSpec.hs index 264a490..509d595 100644 --- a/test/Ldap/Client/BindSpec.hs +++ b/test/Ldap/Client/BindSpec.hs @@ -30,7 +30,7 @@ spec = do (Ldap.Type.Simple "public")) Ldap.InvalidCredentials (Dn "cn=admin") - "Invalid Credentials")) + "InvalidCredentialsError")) it "binds as ‘pikachu’" $ do res <- locally $ \l -> do diff --git a/test/Ldap/Client/SearchSpec.hs b/test/Ldap/Client/SearchSpec.hs index 0ab9afb..cb0c993 100644 --- a/test/Ldap/Client/SearchSpec.hs +++ b/test/Ldap/Client/SearchSpec.hs @@ -47,7 +47,7 @@ spec = do (Ldap.ResponseErrorCode req Ldap.InsufficientAccessRights (Dn "o=localhost") - "Insufficient Access Rights")) + "InsufficientAccessRightsError")) it "‘present’ filter" $ do res <- locally $ \l -> do