diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-11-22 14:56:44 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-11-22 14:56:44 +0900 |
| commit | 1f7fdd610686632eafae1ee9d6945a3ecebe1aef (patch) | |
| tree | f4c6e0b9d4262a9d175c034b9b93449777399ccd | |
| parent | cfd0a44e82ddaa01dc194025b8d57143e64e7a9b (diff) | |
| parent | 8e79900909c152ad11b88d5cc8533918cca07709 (diff) | |
| download | ruby-openssl-1f7fdd610686632eafae1ee9d6945a3ecebe1aef.tar.gz | |
Merge branch 'ky/x509-implement-eq'
* ky/x509-implement-eq:
test/test_x509crl: fix random failure
test/test_x509cert: fix flaky test
| -rw-r--r-- | test/test_x509cert.rb | 16 | ||||
| -rw-r--r-- | test/test_x509crl.rb | 8 |
2 files changed, 16 insertions, 8 deletions
diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb index bde3fbc9..40a5b0ad 100644 --- a/test/test_x509cert.rb +++ b/test/test_x509cert.rb @@ -170,11 +170,17 @@ class OpenSSL::TestX509Certificate < OpenSSL::TestCase end def test_eq - cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil) - cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024) - cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024) - cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024) - cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, digest: "sha512") + now = Time.now + cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil, + not_before: now, not_after: now + 3600) + cert1 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, + not_before: now, not_after: now + 3600) + cert2 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, + not_before: now, not_after: now + 3600) + cert3 = issue_cert(@ee1, @rsa2048, 3, [], cacert, @rsa1024, + not_before: now, not_after: now + 3600) + cert4 = issue_cert(@ee1, @rsa2048, 2, [], cacert, @rsa1024, + digest: "sha512", not_before: now, not_after: now + 3600) assert_equal false, cert1 == 12345 assert_equal true, cert1 == cert2 diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb index a11073fb..03fdf64d 100644 --- a/test/test_x509crl.rb +++ b/test/test_x509crl.rb @@ -221,11 +221,13 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase end def test_eq + now = Time.now + cacert = issue_cert(@ca, @rsa1024, 1, [], nil, nil) - crl1 = issue_crl([], 1, Time.now, Time.now + 3600, [], cacert, @rsa1024, "sha256") + crl1 = issue_crl([], 1, now, now + 3600, [], cacert, @rsa1024, "sha256") rev1 = OpenSSL::X509::Revoked.new.tap { |rev| rev.serial = 1 - rev.time = Time.now + rev.time = now } crl1.add_revoked(rev1) crl2 = OpenSSL::X509::CRL.new(crl1.to_der) @@ -235,7 +237,7 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase assert_equal true, crl1 == crl2 rev2 = OpenSSL::X509::Revoked.new.tap { |rev| rev.serial = 2 - rev.time = Time.now + rev.time = now } crl2.add_revoked(rev2) assert_equal false, crl1 == crl2 |