X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestSeparateSessionScope.java;h=c5979acf3de3e09984ba769e82e6159497049f91;hb=306f6d90d39ea81d02c1ca5b01291f9f5718f8ab;hp=9d2ff10c411ed21bfd67eb4ea5d692f5566f6fbc;hpb=aa5723dbb64ec8efa63909d39ff72364f0a5ee96;p=gigi.git diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java index 9d2ff10c..c5979acf 100644 --- a/tests/org/cacert/gigi/TestSeparateSessionScope.java +++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java @@ -34,8 +34,9 @@ public class TestSeparateSessionScope extends ManagedTest { User u = User.getById(user); Certificate c = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); final PrivateKey pk = kp.getPrivate(); - c.issue(null, "2y", u).waitFor(60000); + await(c.issue(null, "2y", u)); final X509Certificate ce = c.cert(); + c.setLoginEnabled(true); String scookie = login(pk, ce); assertTrue(isLoggedin(cookie)); @@ -56,9 +57,10 @@ public class TestSeparateSessionScope extends ManagedTest { Certificate c2 = new Certificate(u, u, Certificate.buildDN("CN", "hans"), Digest.SHA256, csr, CSRType.CSR, CertificateProfile.getById(1)); final PrivateKey pk = kp.getPrivate(); Job j1 = c.issue(null, "2y", u); - c2.issue(null, "2y", u).waitFor(60000); - j1.waitFor(60000); + await(c2.issue(null, "2y", u)); + await(j1); final X509Certificate ce = c.cert(); + c.setLoginEnabled(true); String scookie = login(pk, ce); checkCertLogin(c, pk, scookie, 200);