Skip to content

Commit 38b56cd

Browse files
Edge server tests not depending on remoteshell and httpclient (#344)
* Added edge server code * Added exception class for edge server * Added EdgeServerInfo to parse edge server from config * Added test_blobs.py * Added test_crud.py * Added tests/QE/edge_server/test_database_edge_server.py * Added tests for ttl and expires query params testing * Added code needed for edge server testing * Removed tests depending on remoteshell * Add edge server blob test images * After ruff checks * Ruff formatting * More pythonic keyspace builder * Changed expires duration to 10s from 20s
1 parent e73cffd commit 38b56cd

File tree

11 files changed

+1723
-3
lines changed

11 files changed

+1723
-3
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ dataset/server/**/*.jpg filter=lfs diff=lfs merge=lfs -text
33
dataset/server/**/*.png filter=lfs diff=lfs merge=lfs -text
44
dataset/server/**/*.blob filter=lfs diff=lfs merge=lfs -text
55
dataset/couchbase-server/**/*.zip filter=lfs diff=lfs merge=lfs -text
6+
dataset/edge-server/**/*.jpg filter=lfs diff=lfs merge=lfs -text
7+
dataset/edge-server/**/*.png filter=lfs diff=lfs merge=lfs -text

client/src/cbltest/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
from json import dumps
22

33
from .api.couchbaseserver import CouchbaseServer
4+
from .api.edgeserver import EdgeServer
45
from .api.syncgateway import SyncGateway
56
from .api.testserver import TestServer
67
from .assertions import _assert_not_null
78
from .configparser import (
89
CouchbaseServerInfo,
10+
EdgeServerInfo,
911
ParsedConfig,
1012
SyncGatewayInfo,
1113
TestServerInfo,
@@ -59,6 +61,11 @@ def couchbase_servers(self) -> list[CouchbaseServer]:
5961
"""Gets the list of Couchbase Servers available"""
6062
return self.__couchbase_servers
6163

64+
@property
65+
def edge_servers(self) -> list[EdgeServer]:
66+
"""Gets the list of Edge Servers available"""
67+
return self.__edge_servers
68+
6269
@property
6370
def load_balancers(self) -> list[str]:
6471
"""Gets the list of Load Balancers available"""
@@ -146,6 +153,12 @@ def __init__(
146153
)
147154
)
148155

156+
self.__edge_servers: list[EdgeServer] = []
157+
if not test_server_only:
158+
for es in self.__config.edge_servers:
159+
es_info = EdgeServerInfo(es)
160+
self.__edge_servers.append(EdgeServer(es_info.hostname))
161+
149162
async def resolve_api_version(self) -> None:
150163
ts_index = 0
151164
apiVersion = 0

0 commit comments

Comments
 (0)