test-sysroot: Update for API change

This commit is contained in:
Colin Walters 2014-01-18 17:50:22 -05:00
parent 878a43411e
commit 1a20ab4420
1 changed files with 12 additions and 12 deletions

View File

@ -75,9 +75,9 @@ sysrootRepo.pull('testos', null, 0, null, null);
let mergeDeployment = sysroot.get_merge_deployment('testos'); let mergeDeployment = sysroot.get_merge_deployment('testos');
let origin = sysroot.origin_new_from_refspec(runtimeRef); let origin = sysroot.origin_new_from_refspec(runtimeRef);
let [,deployment] = sysroot.deploy_one_tree('testos', rev, origin, let [,deployment] = sysroot.deploy_tree('testos', rev, origin,
null, mergeDeployment, mergeDeployment, null,
null); null);
let newDeployments = deployments; let newDeployments = deployments;
deployments = null; deployments = null;
newDeployments.unshift(deployment); newDeployments.unshift(deployment);
@ -100,9 +100,9 @@ assertEquals(deploymentPath.query_exists(null), false);
//// Ok, redeploy, then add a new revision upstream and pull it //// Ok, redeploy, then add a new revision upstream and pull it
let [,deployment] = sysroot.deploy_one_tree('testos', rev, origin, let [,deployment] = sysroot.deploy_tree('testos', rev, origin,
null, mergeDeployment, mergeDeployment, null,
null); null);
newDeployments = deployments; newDeployments = deployments;
deployments = null; deployments = null;
newDeployments.unshift(deployment); newDeployments.unshift(deployment);
@ -120,9 +120,9 @@ assertNotEquals(rev, newRev);
mergeDeployment = sysroot.get_merge_deployment('testos'); mergeDeployment = sysroot.get_merge_deployment('testos');
assertEquals(mergeDeployment.get_csum(), deployment.get_csum()); assertEquals(mergeDeployment.get_csum(), deployment.get_csum());
let [,newDeployment] = sysroot.deploy_one_tree('testos', newRev, origin, let [,newDeployment] = sysroot.deploy_tree('testos', newRev, origin,
null, mergeDeployment, mergeDeployment, null,
null); null);
newDeployments = [newDeployment, mergeDeployment]; newDeployments = [newDeployment, mergeDeployment];
assertNotEquals(mergeDeployment.get_bootcsum(), newDeployment.get_bootcsum()); assertNotEquals(mergeDeployment.get_bootcsum(), newDeployment.get_bootcsum());
assertNotEquals(mergeDeployment.get_csum(), newDeployment.get_csum()); assertNotEquals(mergeDeployment.get_csum(), newDeployment.get_csum());
@ -143,9 +143,9 @@ let [,thirdRev] = sysrootRepo.resolve_rev(runtimeRef, false);
assertNotEquals(newRev, thirdRev); assertNotEquals(newRev, thirdRev);
mergeDeployment = sysroot.get_merge_deployment('testos'); mergeDeployment = sysroot.get_merge_deployment('testos');
let [,thirdDeployment] = sysroot.deploy_one_tree('testos', thirdRev, origin, let [,thirdDeployment] = sysroot.deploy_tree('testos', thirdRev, origin,
null, mergeDeployment, mergeDeployment, null,
null); null);
assertEquals(mergeDeployment.get_bootcsum(), thirdDeployment.get_bootcsum()); assertEquals(mergeDeployment.get_bootcsum(), thirdDeployment.get_bootcsum());
assertNotEquals(mergeDeployment.get_csum(), thirdDeployment.get_csum()); assertNotEquals(mergeDeployment.get_csum(), thirdDeployment.get_csum());
newDeployments = [deployment, newDeployment, thirdDeployment]; newDeployments = [deployment, newDeployment, thirdDeployment];