Commit fd5c2933 authored by Sam Thursfield's avatar Sam Thursfield

Merge branch 'sam/test-fixes' into 'master'

functional-tests: Two small fixes

See merge request !135
parents 8f9645c8 802caa34
Pipeline #115009 failed with stage
in 3 minutes and 4 seconds
......@@ -27,6 +27,8 @@ test-fedora-latest:
su tracker -c 'cd build; meson test --print-errorlogs ${MESON_TEST_EXTRA_ARGS}'
after_script:
- |
python3 -c 'import multiprocessing; print(f"Meson probably started {multiprocessing.cpu_count()} tests in parallel.")'
- |
echo "Test suite settings:"
echo
......
......@@ -76,6 +76,7 @@ class OntologyChangeTestTemplate (ut.TestCase):
self.__assert_ontology_dates(self.FIRST_ONTOLOGY_DIR, self.SECOND_ONTOLOGY_DIR)
extra_env = cfg.test_environment(self.tmpdir)
extra_env['LANG'] = 'en_GB.utf8'
extra_env['LC_COLLATE'] = 'en_GB.utf8'
extra_env['TRACKER_DB_ONTOLOGIES_DIR'] = self.get_ontology_dir(self.FIRST_ONTOLOGY_DIR)
......
......@@ -7,6 +7,8 @@ sandbox_args = ['-m', 'trackertestutils', '--dbus-config', test_dbus_config, '--
sandbox_env = environment()
test_env.set('GSETTINGS_SCHEMA_DIR', tracker_uninstalled_gsettings_schema_dir)
test_env.set('LANG', 'en_GB.utf-8')
test_env.prepend('PYTHONPATH', tracker_uninstalled_testutils_dir)
test_env.set('TRACKER_DB_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
test_env.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', tracker_uninstalled_stop_words_dir)
......
......@@ -148,9 +148,9 @@ int main (string[] args) {
print ("ORIGINAL : %u contacts: %f\n", y, timer.elapsed());
}
return 0;
} catch (GLib.Error e) {
critical ("%s", e.message);
return 1;
}
return 0;
}
......@@ -432,11 +432,15 @@ def main():
try:
if args.command:
command = [shell, '-c', ' '.join(shlex.quote(c) for c in args.command)]
log.debug("Running: %s", command)
subprocess.run(command)
result = subprocess.run(command)
if len(miner_watches) > 0:
wait_for_miners(miner_watches)
log.debug("Process finished with returncode %i", result.returncode)
sys.exit(result.returncode)
else:
if args.dbus_config:
print(f"Using Tracker daemons from build tree with D-Bus config {args.dbus_config}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment