diff options
Diffstat (limited to 'tests/functional-tests/common/utils/helpers.py')
| -rw-r--r-- | tests/functional-tests/common/utils/helpers.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/functional-tests/common/utils/helpers.py b/tests/functional-tests/common/utils/helpers.py index d085e2697..95e48401b 100644 --- a/tests/functional-tests/common/utils/helpers.py +++ b/tests/functional-tests/common/utils/helpers.py @@ -78,9 +78,7 @@ class Helper: sys.excepthook = new_hook def _start_process (self): - path = getattr (self, - "PROCESS_PATH", - os.path.join (cfg.EXEC_PREFIX, self.PROCESS_NAME)) + path = self.PROCESS_PATH flags = getattr (self, "FLAGS", []) @@ -93,7 +91,10 @@ class Helper: command = [path] + flags log ("Starting %s" % ' '.join(command)) - return subprocess.Popen ([path] + flags, **kws) + try: + return subprocess.Popen ([path] + flags, **kws) + except OSError as e: + raise RuntimeError("Error starting %s: %s" % (path, e)) def _bus_name_appeared(self, name, owner, data): log ("[%s] appeared in the bus as %s" % (self.PROCESS_NAME, owner)) @@ -212,6 +213,7 @@ class StoreHelper (Helper): """ PROCESS_NAME = "tracker-store" + PROCESS_PATH = cfg.TRACKER_STORE_PATH BUS_NAME = cfg.TRACKER_BUSNAME graph_updated_handler_id = 0 @@ -469,6 +471,9 @@ class StoreHelper (Helper): def update (self, update_sparql, timeout=5000, **kwargs): return self.resources.SparqlUpdate ('(s)', update_sparql, timeout=timeout, **kwargs) + def load (self, ttl_uri, timeout=5000, **kwargs): + return self.resources.Load ('(s)', ttl_uri, timeout=timeout, **kwargs) + def batch_update (self, update_sparql, **kwargs): return self.resources.BatchSparqlUpdate ('(s)', update_sparql, **kwargs) |