From c3e5e4683497edc4826505e259e7e3b27eda1dab Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 8 Nov 2014 18:01:58 +0000 Subject: Simplify RRDP schema again: one delta file now contains exactly one delta rather than a range. svn path=/branches/tk705/; revision=6010 --- ca/tests/test-rrdp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ca/tests/test-rrdp.py') diff --git a/ca/tests/test-rrdp.py b/ca/tests/test-rrdp.py index db626a35..9b7f207c 100755 --- a/ca/tests/test-rrdp.py +++ b/ca/tests/test-rrdp.py @@ -34,6 +34,7 @@ parser.add_argument("--yaml-file", default = "smoketest.2.yaml") parser.add_argument("--delay", type = int, default = 30) parser.add_argument("--exhaustive", action = "store_true") parser.add_argument("--skip-daemons", action = "store_true") +parser.add_argument("--dry-run", action = "store_true") args = parser.parse_args() def log(msg): @@ -42,7 +43,8 @@ def log(msg): def run(*argv): log("Running: " + " ".join(argv)) - subprocess.check_call(argv) + if not args.dry_run: + subprocess.check_call(argv) def dataglob(pattern): return glob.iglob(os.path.join(("smoketest.dir" if args.use_smoketest else "yamltest.dir/RIR"), pattern)) @@ -51,7 +53,7 @@ def snapshot_to_serial(fn): return int(os.path.splitext(os.path.basename(fn))[0]) def delta_to_serial(fn): - return int(os.path.splitext(os.path.basename(fn))[0].split("-")[1]) + return int(os.path.splitext(os.path.basename(fn))[0]) top = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "..")) -- cgit v1.2.3