shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-28 02:50:37 +03:00
Code Issues Projects Releases Wiki Activity

tests: More fixes for gjs tests

Browse Source 
Previous to this commit, the gjs tests were installed-only; and our
logic for handling the "--enable-installed-tests=exclusive" logic
actually also meant they weren't installed.

It did work for me locally with `--enable-installed-tests`.

However, to make things fully symmetric, let's enable the js tests to also be
run under `make check`.

Also remove `corrupt-repo-ref.js` from the PAPR invocation since it's not
actually a unit test, it's a utility helper.

Closes: #1022
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-20 10:32:44 -04:00 committed by Atomic Bot
parent ef6f6bc688
commit ed99b4169e
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.papr.yml
View File

@ -100,7 +100,7 @@ env:
CONFIGOPTS: "--with-curl --with-openssl"
# ASAN conflicts with introspection testing;
# See https://github.com/ostreedev/ostree/issues/1014
INSTALLED_TESTS_PATTERN: "libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js libostree/test-corrupt-repo-ref.js"
INSTALLED_TESTS_PATTERN: "libostree/test-sizes.js libostree/test-sysroot.js libostree/test-core.js"
tests:
- ci/build-check.sh

2
Makefile-tests.am
View File

@ -191,7 +191,7 @@ js_installed_tests = \
$(NULL)
if BUILDOPT_GJS
dist_installed_test_scripts = $(js_installed_tests)
_installed_or_uninstalled_test_scripts += $(js_installed_tests)
else
EXTRA_DIST += $(js_installed_tests)
endif

4
tests/test-core.js Normal file → Executable file
View File

@ -25,6 +25,8 @@ function assertEquals(a, b) {
throw new Error("assertion failed " + JSON.stringify(a) + " == " + JSON.stringify(b));
}
print('1..1')
let testDataDir = Gio.File.new_for_path('test-data');
testDataDir.make_directory(null);
testDataDir.get_child('some-file').replace_contents("hello world!", null, false, 0, null);
@ -66,4 +68,4 @@ repo.commit_transaction(null, null);
[,readCommit] = repo.resolve_rev('someref', true);
assertEquals(readCommit, null);
print("test-core complete");
print("ok test-core");

4
tests/test-sizes.js Normal file → Executable file
View File

@ -26,6 +26,8 @@ function assertEquals(a, b) {
throw new Error("assertion failed " + JSON.stringify(a) + " == " + JSON.stringify(b));
}
print('1..1')
let testDataDir = Gio.File.new_for_path('test-data');
testDataDir.make_directory(null);
testDataDir.get_child('some-file').replace_contents("hello world!", null, false, 0, null);
@ -79,4 +81,4 @@ if (expectedUncompressedSizes.length > 0) {
throw new Error("Failed to match expectedUncompressedSizes: " + JSON.stringify(expectedUncompressedSizes));
}
print("test-sizes complete");
print("ok test-sizes");

6
tests/test-sysroot.js Normal file → Executable file
View File

@ -33,11 +33,13 @@ function assertNotEquals(a, b) {
function libtestExec(shellCode) {
let testdatadir = GLib.getenv("G_TEST_SRCDIR");
let libtestPath = GLib.build_filenamev([testdatadir, 'libtest.sh'])
let libtestPath = GLib.build_filenamev([testdatadir, 'tests/libtest.sh'])
let proc = Gio.Subprocess.new(['bash', '-c', 'set -xeuo pipefail; . ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], 0);
proc.wait_check(null);
}
print('1..1')
libtestExec('setup_os_repository archive-z2 syslinux');
let upstreamRepo = OSTree.Repo.new(Gio.File.new_for_path('testos-repo'));
@ -145,3 +147,5 @@ newDeployments = [deployment, newDeployment, thirdDeployment];
sysroot.write_deployments(newDeployments, null);
deployments = sysroot.get_deployments();
assertEquals(deployments.length, 3);
print("ok test-sysroot")