maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

testing: improved parallel testing of Akonadi

Browse source 
Somehow akonadi.db ends up lacking any resources. Check each sqlite3 call, log
db content and explicitly close akonadiserverc to be more resilient.
This commit is contained in:
Patrick Ohly 2014-03-20 06:22:50 -07:00
parent 2d862c7375
commit 77ae1f2d09
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/runtests.py
View file

@ -297,19 +297,26 @@ class Action:
# Replace XDG_DATA_HOME paths inside the sqlite3 db.
# This runs *outside* of the chroot. It relies on
# compatibility between the sqlite3 inside and outside the chroots.
subprocess.call("sqlite3 '%s' .dump | sed -e 's;%s;%s;g' | sqlite3 '%s'" %
(source,
os.path.expanduser('~/.local/share/'),
os.path.join(context.stripSchrootDir(home), 'data'),
target),
shell=True)
db = subprocess.check_output(['sqlite3', source, '.dump'])
db = db.replace(os.path.expanduser('~/.local/share/'),
os.path.join(context.stripSchrootDir(home), 'data', ''))
sqlite = subprocess.Popen(['sqlite3', target],
stdin=subprocess.PIPE)
sqlite.communicate(db)
if sqlite.returncode:
raise Exception("sqlite3 returned %d" % sqlite.returncode)
db = subprocess.check_output(['sqlite3', target, '.dump'])
log('target %s:\n%s', target, db)
elif entry == 'akonadiserverrc':
# Replace hard-coded path to XDG dirs.
content = open(source).read()
for old, new, name in mapping:
content = content.replace(os.path.expanduser('~/%s/' % old),
os.path.join(context.stripSchrootDir(home), new, ''))
open(target, 'w').write(content)
rc = open(target, 'w')
rc.write(content)
rc.close()
log('target %s:\n%s', target, content)
os.environ['HOME'] = context.stripSchrootDir(home)
for old, new, name in mapping:
newdir = os.path.join(home, new)