diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2011-04-10 15:13:04 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2011-04-10 15:13:04 (GMT) |
| commit | aaa29df9daf56c7fc2448ae4bb55619fdaee4fd4 (patch) | |
| tree | 0c0a974d43ab88eb3747491cfbad7fac58f1bdab /tests/runalltests.py | |
| parent | f4d217831054b8fb63181697efce07c9147c8a25 (diff) | |
first working implementation
Diffstat (limited to 'tests/runalltests.py')
| -rwxr-xr-x | tests/runalltests.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/runalltests.py b/tests/runalltests.py index f539746..c39aa12 100755 --- a/tests/runalltests.py +++ b/tests/runalltests.py @@ -32,9 +32,10 @@ logging.basicConfig(level=logging.WARN, DOCTESTS = [ - 'basic_api.txt', + 'sugar_api_v2.txt', ] -DOCTEST_OPTIONS = doctest.ELLIPSIS | doctest.REPORT_ONLY_FIRST_FAILURE | REPORT_UDIFF +DOCTEST_OPTIONS = (doctest.ELLIPSIS | doctest.REPORT_ONLY_FIRST_FAILURE | + doctest.REPORT_UDIFF) DS_DBUS_SERVICE = 'org.silbe.GDataStore' DS_DBUS_INTERFACE = 'org.silbe.GDataStore' @@ -70,12 +71,12 @@ def setup(): environment['PATH'] = os.path.join(basedir, 'bin')+':'+os.environ['PATH'] servicedir = os.path.join(environment['HOME'], 'dbus-1', 'services') - servicepath = os.path.join(servicedir, 'org.silbe.GDataStore.service') + servicepath = os.path.join(servicedir, 'org.laptop.sugar.DataStore.service') os.makedirs(servicedir) servicefile = file(servicepath, 'w') servicefile.write(""" [D-BUS Service] - Name = org.silbe.GDataStore + Name = org.laptop.sugar.DataStore Exec = %s/bin/gdatastore-service """.replace(' ', '') % (basedir, )) servicefile.close() @@ -174,7 +175,7 @@ class TestSuiteWrapper(unittest.TestCase): def tearDown(self): self._kill_data_store() - self._clean_data_store() + #self._clean_data_store() def _kill_data_store(self): pgrep = subprocess.Popen(['pgrep', '-g', os.environ['DBUS_PID'], @@ -197,7 +198,7 @@ class TestSuiteWrapper(unittest.TestCase): self._loop.quit() def _clean_data_store(self): - shutil.rmtree(os.path.expanduser('~/.gdatastore')) + shutil.rmtree(os.path.expanduser('~/.gdatastore/git')) class TimedTestResult(unittest._TextTestResult): |