packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Fix two bugs in tests revealed by new remote changes

This commit is contained in:
Colin Walters 2014-12-17 10:43:01 -05:00
parent f6a6e68412
commit 9dadebb501
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test-admin-deploy-2.sh
View File

@ -46,7 +46,6 @@ ostree admin --sysroot=sysroot upgrade --os=testos
bootcsum2=${bootcsum} bootcsum2=${bootcsum}
os_repository_new_commit "1" os_repository_new_commit "1"
bootcsum3=${bootcsum} bootcsum3=${bootcsum}
ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
ostree admin --sysroot=sysroot upgrade --os=testos ostree admin --sysroot=sysroot upgrade --os=testos
rev=${newrev} rev=${newrev}

9
tests/test-sysroot.js
View File

@ -64,12 +64,9 @@ assertEquals(deployments.length, 0);
//// Add the remote, and do a pull //// Add the remote, and do a pull
let [,sysrootRepo] = sysroot.get_repo(null); let [,sysrootRepo] = sysroot.get_repo(null);
let sysrootRepoConfig = sysrootRepo.get_config(); sysrootRepo.remote_add('testos', 'file://' + upstreamRepo.get_path().get_path(),
let testosRefSection = 'remote "testos"'; GLib.Variant.new('a{sv}', {'gpg-verify': GLib.Variant.new('b', false),
sysrootRepoConfig.set_string(testosRefSection, 'url', 'file://' + upstreamRepo.get_path().get_path()); 'branches': GLib.Variant.new('as', [runtimeRef])}), null);
sysrootRepoConfig.set_boolean(testosRefSection, 'gpg-verify', false);
sysrootRepoConfig.set_string_list(testosRefSection, 'branches', [runtimeRef]);
sysrootRepo.pull('testos', null, 0, null, null); sysrootRepo.pull('testos', null, 0, null, null);
//// TEST: We can deploy one tree //// TEST: We can deploy one tree