Disable PG test

qgis · Nov 14, 2017 · 1a17b90 · 1a17b90
1 parent 14df327
commit 1a17b90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt
@@ -33,3 +33,4 @@ PyQgsServerAccessControl
 # Need a local postgres installation
 PyQgsAuthManagerPKIPostgresTest
 PyQgsAuthManagerPasswordPostgresTest
+PyQgsAuthManagerOgrPostgresTest
diff --git a/src/auth/basic/qgsauthbasicmethod.cpp b/src/auth/basic/qgsauthbasicmethod.cpp
@@ -135,7 +135,7 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
         if ( uri.startsWith( QStringLiteral( "PG:" ) ) )
         {
           bool chopped = false;
-          if ( uri.endsWith('"'))
+          if ( uri.endsWith( '"' ) )
           {
             uri.chop( 1 );
             chopped = true;
@@ -162,7 +162,7 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
         else if ( uri.startsWith( QStringLiteral( "IDB" ) ) )
         {
           bool chopped = false;
-          if ( uri.endsWith('"'))
+          if ( uri.endsWith( '"' ) )
           {
             uri.chop( 1 );
             chopped = true;
@@ -222,7 +222,7 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
       // Handle sub-layers
       if ( fullUri.contains( '|' ) )
       {
-        uri += '|' + fullUri.right( fullUri.length() - fullUri.lastIndexOf( '|' ) - 1);
+        uri += '|' + fullUri.right( fullUri.length() - fullUri.lastIndexOf( '|' ) - 1 );
       }
       connectionItems.replace( 0, uri );
     }

diff --git a/tests/src/python/test_authmanager_ogr.py b/tests/src/python/test_authmanager_ogr.py
@@ -2,14 +2,8 @@
 """
 Tests for auth manager Basic Auth OGR connection credentials injection
 
-
 From build dir, run: ctest -R PyQgsAuthManagerOgrTest -V
 
-or, if your PostgreSQL path differs from the default:
-
-QGIS_POSTGRES_EXECUTABLE_PATH=/usr/lib/postgresql/<your_version_goes_here>/bin \
-    ctest -R PyQgsAuthManagerOgrTest -V
-
 .. note:: This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -21,9 +15,7 @@
     QgsApplication,
     QgsAuthManager,
     QgsAuthMethodConfig,
-    QgsVectorLayer,
     QgsDataSourceUri,
-    QgsWkbTypes,
     QgsProviderRegistry,
 )