diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2011-05-16 09:04:43 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2011-05-16 09:04:43 (GMT) |
| commit | 9997e606caaecd49df3cc215b90486980a591afe (patch) | |
| tree | af6bf3cabdb9a81eb0e957c3c8f441ad070b824b | |
| parent | ba4764c458db4be9798cd21a273c5bfda47fb4d4 (diff) | |
runalltests.py: Fix data store process exit detection
The reason waiting for the data store process to exit and release its bus name
was unreliable was that we used a name that it is not (yet) providing.
Python-dbus explicitly calls GetNameOwner upon invocation of
watch_name_owner(), so we would get a callback right away instead of hanging
because the name doesn't exist.
| -rwxr-xr-x | tests/runalltests.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/runalltests.py b/tests/runalltests.py index 50859c9..26df032 100755 --- a/tests/runalltests.py +++ b/tests/runalltests.py @@ -37,9 +37,9 @@ DOCTESTS = [ DOCTEST_OPTIONS = (doctest.ELLIPSIS | doctest.REPORT_ONLY_FIRST_FAILURE | doctest.REPORT_UDIFF) -DS_DBUS_SERVICE = 'org.silbe.GDataStore' -DS_DBUS_INTERFACE = 'org.silbe.GDataStore' -DS_DBUS_PATH = "/org/silbe/GDataStore" +DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' +DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' +DS_DBUS_PATH = '/org/laptop/sugar/DataStore' ENVIRONMENT_WHITELIST = [ 'MALLOC_CHECK_', @@ -175,11 +175,6 @@ class TestSuiteWrapper(unittest.TestCase): def tearDown(self): self._kill_data_store() - # For some unknown reason, we need to wait a bit more even after - # the process died and D-Bus acknowledged the service has shut down. - # On my system (Athlon BE 2300, 1.9GHz), 30ms were necessary. With - # 500ms we should be on the safe side. - time.sleep(.5) self._clean_data_store() def _kill_data_store(self): |