Refactor how net/data/verify_certificate_chain_unittest/*

net/data/verify_certificate_chain_unittest/key-rollover/generate-chains.py

Index: net/data/verify_certificate_chain_unittest/key-rollover/generate-chains.py
diff --git a/net/data/verify_certificate_chain_unittest/generate-key-rollover.py b/net/data/verify_certificate_chain_unittest/key-rollover/generate-chains.py
similarity index 71%
rename from net/data/verify_certificate_chain_unittest/generate-key-rollover.py
rename to net/data/verify_certificate_chain_unittest/key-rollover/generate-chains.py
index f838098723afeb15ffcce4e802dbaa489c3cb5eb..2dd5ba3e3b2afa27b2b68026fa593115ac52b2bd 100755
--- a/net/data/verify_certificate_chain_unittest/generate-key-rollover.py
+++ b/net/data/verify_certificate_chain_unittest/key-rollover/generate-chains.py
@@ -37,6 +37,9 @@ Several chains are output:
 All of these chains should verify successfully.
 """
 
+import sys
+sys.path += ['..']
+
 import common
 
 # The new certs should have a newer notbefore date than "old" certs. This should
@@ -69,28 +72,12 @@ newintermediate.set_validity_range(JANUARY_2_2015_UTC,
 # Target certificate.
 target = common.create_end_entity_certificate('Target', oldintermediate)
 
-oldchain = [target, oldintermediate]
-rolloverchain = [target, newintermediate, newrootrollover]
-longrolloverchain = [target, newintermediate, newroot, newrootrollover]
-oldtrusted = common.TrustAnchor(oldroot, constrained=False)
-
-newchain = [target, newintermediate]
-newtrusted = common.TrustAnchor(newroot, constrained=False)
-
-time = common.DEFAULT_TIME
-key_purpose = common.DEFAULT_KEY_PURPOSE
-verify_result = True
-errors = None
-
-common.write_test_file(__doc__, oldchain, oldtrusted, time, key_purpose,
-                       verify_result, errors,
-                       out_pem="key-rollover-oldchain.pem")
-common.write_test_file(__doc__, rolloverchain, oldtrusted, time, key_purpose,
-                       verify_result, errors,
-                       out_pem="key-rollover-rolloverchain.pem")
-common.write_test_file(__doc__, longrolloverchain, oldtrusted, time,
-                       key_purpose, verify_result, errors,
-                       out_pem="key-rollover-longrolloverchain.pem")
-common.write_test_file(__doc__, newchain, newtrusted, time, key_purpose,
-                       verify_result, errors,
-                       out_pem="key-rollover-newchain.pem")
+common.write_chain(__doc__, [target, oldintermediate, oldroot],
+                   out_pem="oldchain.pem")
+common.write_chain(__doc__, [target, newintermediate, newrootrollover, oldroot],
+                   out_pem="rolloverchain.pem")
+common.write_chain(__doc__,
+                  [target, newintermediate, newroot, newrootrollover, oldroot],
+                  out_pem="longrolloverchain.pem")
+common.write_chain(__doc__, [target, newintermediate, newroot],
+                   out_pem="newchain.pem")