haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-08-23 09:08:32 +00:00
Code Issues Releases Wiki Activity

Use local seaf-server when running tests

Browse Source
This commit is contained in:
Shuai Lin 2018-01-29 19:30:13 +08:00
parent 7827725598
commit b4148aea30
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci/run.py
View File

@ -188,7 +188,12 @@ def main():
def start_and_test_with_db(db): def start_and_test_with_db(db):
info('Setting up seafile server with %s database', db) info('Setting up seafile server with %s database', db)
server = ServerCtl(INSTALLDIR, db) server = ServerCtl(
INSTALLDIR,
db=db,
# Use the newly built seaf-server (to avoid "make install" each time when developping locally)
seaf_server_bin=join(SeafileServer().projectdir, 'server/seaf-server')
)
server.setup() server.setup()
with server.run(): with server.run():
info('Testing with %s database', db) info('Testing with %s database', db)

9
ci/serverctl.py
View File

@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
class ServerCtl(object): class ServerCtl(object):
def __init__(self, datadir, db='sqlite3'): def __init__(self, datadir, db='sqlite3', seaf_server_bin='seaf-server', ccnet_server_bin='ccnet-server'):
self.db = db self.db = db
self.datadir = datadir self.datadir = datadir
self.central_conf_dir = join(datadir, 'conf') self.central_conf_dir = join(datadir, 'conf')
@ -34,6 +34,9 @@ class ServerCtl(object):
self.ccnet_log = join(self.log_dir, 'ccnet.log') self.ccnet_log = join(self.log_dir, 'ccnet.log')
self.seafile_log = join(self.log_dir, 'seafile.log') self.seafile_log = join(self.log_dir, 'seafile.log')
self.ccnet_server_bin = ccnet_server_bin
self.seaf_server_bin = seaf_server_bin
self.ccnet_proc = None self.ccnet_proc = None
self.seafile_proc = None self.seafile_proc = None
@ -137,7 +140,7 @@ connection_charset = utf8
def start_ccnet(self): def start_ccnet(self):
cmd = [ cmd = [
"ccnet-server", self.ccnet_server_bin,
"-F", "-F",
self.central_conf_dir, self.central_conf_dir,
"-c", "-c",
@ -149,7 +152,7 @@ connection_charset = utf8
def start_seafile(self): def start_seafile(self):
cmd = [ cmd = [
"seaf-server", self.seaf_server_bin,
"-F", "-F",
self.central_conf_dir, self.central_conf_dir,
"-c", "-c",