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

testing: wait for background daemon in wrappercheck

Browse source 
When starting a daemon via wrappercheck, optionally wait for the
daemon to write a certain message to its log file. The message is
searched for with "grep -e", so regular expressions matching one line
are acceptable. Only works in combination with writing that log file.

This will be used to wait for syncevo-http-server to confirm that it
is running and ready to accept connections.
This commit is contained in:
Patrick Ohly 2014-02-02 19:08:57 +01:00
parent d747fc1e14
commit da6dab0d3b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/runtests.py
View file

@ -920,7 +920,10 @@ class SyncEvolutionTest(Action):
if toconvert.match(f):
# also convert client-test log files to HTML
tohtml = os.path.join(resdir, f + ".html")
os.system("env PATH=.:$PATH synclog2html %s >%s" % (f, tohtml))
synclog2html = os.path.join(self.build.installdir, "usr", "bin", "synclog2html")
if not os.access(synclog2html, os.F_OK):
synclog2html = os.path.join(sync.basedir, "src", "synclog2html")
os.system("%s %s >%s" % (synclog2html, f, tohtml))
basehtml = f + ".html"
if os.path.exists(basehtml):
os.unlink(basehtml)

4
test/test.am
View file

@ -70,7 +70,8 @@ install-test-files:
ln -f -s $(bindir)/syncevolution $(DESTDIR)/$(testdir)
ln -f -s $(bindir)/synccompare $(DESTDIR)/$(testdir)
ln -f -s $(libexecdir)/syncevo-dbus-server $(DESTDIR)/$(testdir)
cp config.h $(top_srcdir)/src/syncevo/SyncConfig.h $(DESTDIR)/$(testdir) # needed by test-dbus.py
ln -f -s $(bindir)/synclog2html $(DESTDIR)/$(testdir)
cp config.h $(top_srcdir)/src/syncevo/SyncConfig.h src/ClientTest.cpp.html $(DESTDIR)/$(testdir) # needed by test-dbus.py
all_uninstall_hooks += uninstall-test-files
uninstall-test-files:
@ -78,6 +79,7 @@ uninstall-test-files:
$(DESTDIR)/$(testdir)/synccompare \
$(DESTDIR)/$(testdir)/syncevo-dbus-server \
$(DESTDIR)/$(testdir)/SyncConfig.h \
$(DESTDIR)/$(testdir)/ClientTests.cpp.html \
$(DESTDIR)/$(testdir)/config.h \
$(NOP)