Refactor how net/data/verify_certificate_chain_unittest/*

net/data/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py

Index: net/data/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py
diff --git a/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py b/net/data/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py
similarity index 72%
rename from net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
rename to net/data/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py
index 037bf013cbf13c19d775854484dcaaa130e9fd5e..63729eea35e71fb91c85b94b4f4bc711c18039af 100755
--- a/net/data/verify_certificate_chain_unittest/generate-expired-intermediate.py
+++ b/net/data/verify_certificate_chain_unittest/expired-intermediate/generate-chains.py
@@ -6,6 +6,9 @@
 """Certificate chain with 1 intermediate, where the intermediate is expired
 (violates validity.notAfter). Verification is expected to fail."""
 
+import sys
+sys.path += ['..']
+
 import common
 
 # Self-signed root certificate (used as trust anchor).
@@ -21,18 +24,9 @@ intermediate.set_validity_range(common.JANUARY_1_2015_UTC,
 target = common.create_end_entity_certificate('Target', intermediate)
 target.set_validity_range(common.JANUARY_1_2015_UTC, common.JANUARY_1_2016_UTC)
 
-chain = [target, intermediate]
-trusted = common.TrustAnchor(root, constrained=False)
 
 # Both the root and target are valid at this time, however the
 # intermediate certificate is not.
-time = common.MARCH_2_2015_UTC
-key_purpose = common.DEFAULT_KEY_PURPOSE
-verify_result = False
-errors = """----- Certificate i=1 (CN=Intermediate) -----
-ERROR: Time is after notAfter
-
-"""
 
-common.write_test_file(__doc__, chain, trusted, time, key_purpose,
-                       verify_result, errors)
+chain = [target, intermediate, root]
+common.write_chain(__doc__, chain, 'chain.pem')