Fix all tests for using postgres uri

jazzband · Oct 29, 2020 · 89ae0a2 · 89ae0a2
1 parent 16f9435
commit 89ae0a2
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 202 deletions.
diff --git a/dbbackup/db/exceptions.py b/dbbackup/db/exceptions.py
@@ -1,4 +1,6 @@
 """Exceptions for database connectors."""
+
+
 class ConnectorError(Exception):
     """Base connector error"""
 

diff --git a/dbbackup/db/postgresql.py b/dbbackup/db/postgresql.py
@@ -1,18 +1,27 @@
 from dbbackup import utils
 import logging
 from .base import BaseCommandDBConnector
+from .exceptions import DumpError
 
 logger = logging.getLogger('dbbackup.command')
 
 
 def create_postgres_uri(self):
-    host = self.settings.get('HOST', '')
-    dbname = self.settings.get('NAME', '')
-    user = self.settings.get('USER', '')
-    password = self.settings.get('PASSWORD')
+    host = self.settings.get('HOST')
+    if not host:
+        raise DumpError('A host name is required')
+
+    dbname = self.settings.get('NAME') or ''
+    user = self.settings.get('USER') or ''
+    password = self.settings.get('PASSWORD') or ''
     password = ':{}'.format(password) if password else ''
+    if not user:
+        password = ''
+    else:
+        host = '@' + host
+
     port = ':{}'.format(self.settings.get('PORT')) if self.settings.get('PORT') else ''
-    dbname = f'--dbname=postgresql://{user}{password}@{host}{port}/{dbname}'
+    dbname = f'--dbname=postgresql://{user}{password}{host}{port}/{dbname}'
     return dbname
 
 
@@ -44,7 +53,6 @@ def _create_dump(self):
             cmd += ' --clean'
 
         cmd = '{} {} {}'.format(self.dump_prefix, cmd, self.dump_suffix)
-        logger.debug('Postgres cmd: ' + cmd)
         stdout, stderr = self.run_command(cmd, env=self.dump_env)
         return stdout
 

diff --git a/dbbackup/tests/settings.py b/dbbackup/tests/settings.py
@@ -3,8 +3,12 @@
 """
 import os
 import tempfile
+import sys
 from dotenv import load_dotenv
-load_dotenv()
+
+test = len(sys.argv) < 0 or sys.argv[1] == 'test'
+if not test:
+    load_dotenv()
 
 DEBUG = False
 
@@ -26,13 +30,15 @@
     'dbbackup.tests.testapp',
 )
 
-DATABASES = {'default': {
-    "ENGINE": os.environ.get('DB_ENGINE', "django.db.backends.sqlite3"),
-    "NAME": os.environ.get('DB_NAME', ":memory:"),
-    "USER": os.environ.get('DB_USER'),
-    "PASSWORD": os.environ.get('DB_PASSWORD'),
-    "HOST": os.environ.get('DB_HOST'),
-}}
+DATABASES = {
+    'default': {
+        "ENGINE": os.environ.get('DB_ENGINE', "django.db.backends.sqlite3"),
+        "NAME": os.environ.get('DB_NAME', ":memory:"),
+        "USER": os.environ.get('DB_USER'),
+        "PASSWORD": os.environ.get('DB_PASSWORD'),
+        "HOST": os.environ.get('DB_HOST'),
+    }
+}
 if os.environ.get('CONNECTOR'):
     CONNECTOR = {'CONNECTOR': os.environ['CONNECTOR']}
     DBBACKUP_CONNECTORS = {'default': CONNECTOR}