mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-05 05:20:34 +00:00
feat: Use databaseBackend config repace databaseEtcd
databaseBackend config contains type and url sub config, It can facilitate the expansion of other types of databases in the future.
This commit is contained in:
+12
-3
@@ -133,9 +133,17 @@ class BaseTest(object):
|
||||
aptlyDir = ".aptly"
|
||||
aptlyConfigFile = ".aptly.conf"
|
||||
expectedCode = 0
|
||||
databaseEtcd = os.environ.get("APTLY_ETCD_DATABASE")
|
||||
if databaseEtcd is None:
|
||||
databaseEtcd = ""
|
||||
databaseType = os.environ.get("APTLY_DATABASE_TYPE")
|
||||
databaseUrl = os.environ.get("APTLY_DATABASE_URL")
|
||||
if databaseType is None:
|
||||
databaseType = ""
|
||||
if databaseUrl is None:
|
||||
databaseUrl = ""
|
||||
|
||||
databaseBackend = {
|
||||
"type": databaseType,
|
||||
"url": databaseUrl,
|
||||
}
|
||||
|
||||
configFile = {
|
||||
"rootDir": f"{os.environ['HOME']}/{aptlyDir}",
|
||||
@@ -157,6 +165,7 @@ class BaseTest(object):
|
||||
"logFormat": "default",
|
||||
"serveInAPIMode": True,
|
||||
"databaseEtcd": databaseEtcd,
|
||||
"databaseBackend": databaseBackend,
|
||||
}
|
||||
configOverride = {}
|
||||
environmentOverride = {}
|
||||
|
||||
@@ -30,5 +30,6 @@
|
||||
"logLevel": "debug",
|
||||
"logFormat": "default",
|
||||
"serveInAPIMode": true,
|
||||
"databaseEtcd": ""
|
||||
"databaseEtcd": "",
|
||||
"databaseBackend": {}
|
||||
}
|
||||
|
||||
@@ -30,5 +30,6 @@
|
||||
"logLevel": "debug",
|
||||
"logFormat": "default",
|
||||
"serveInAPIMode": false,
|
||||
"databaseEtcd": ""
|
||||
"databaseEtcd": "",
|
||||
"databaseBackend": {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user