Add tests

Author: CommanderKeynes

tests/test_connect.py

@@ -1265,7 +1265,7 @@ def test_connect_connection_service_file(self):
         connection_service_file.close()
         os.chmod(connection_service_file.name, stat.S_IWUSR | stat.S_IRUSR)
         try:
-            # passfile path in env
+            # Test connection service file with dbname
             self.run_testcase({
                 'dsn': 'postgresql://?service=test_service_dbname',
                 'env': {
@@ -1283,6 +1283,7 @@ def test_connect_connection_service_file(self):
                     }
                 )
             })
+            # Test connection service file with database
             self.run_testcase({
                 'dsn': 'postgresql://?service=test_service_database',
                 'env': {
@@ -1300,6 +1301,43 @@ def test_connect_connection_service_file(self):
                     }
                 )
             })
+            # Test that envvars are overridden by service file
+            self.run_testcase({
+                'dsn': 'postgresql://?service=test_service_dbname',
+                'env': {
+                    'PGUSER': 'user',
+                    'PGSERVICEFILE': connection_service_file.name
+                },
+                'result': (
+                    [('somehost', 5433)],
+                    {
+                        'user': 'admin',
+                        'password': 'test_password',
+                        'database': 'test_dbname',
+                        'target_session_attrs': 'primary',
+                        'krbsrvname': 'fakekrbsrvname',
+                        'gsslib': 'sspi',
+                    }
+                )
+            })
+            # Test that dsn params overwrite service file
+            self.run_testcase({
+                'dsn': 'postgresql://?service=test_service_dbname&dbname=test_dbname_dsn',
+                'env': {
+                    'PGSERVICEFILE': connection_service_file.name
+                },
+                'result': (
+                    [('somehost', 5433)],
+                    {
+                        'user': 'admin',
+                        'password': 'test_password',
+                        'database': 'test_dbname_dsn',
+                        'target_session_attrs': 'primary',
+                        'krbsrvname': 'fakekrbsrvname',
+                        'gsslib': 'sspi',
+                    }
+                )
+            })
         finally:
             os.unlink(connection_service_file.name)