Handle lack of STH in mergestatus

1 files changed, 8 insertions, 4 deletions

diff --git a/tools/testcase1.py b/tools/testcase1.py
index 63be2e1..233415a 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -13,6 +13,8 @@ import struct
 import hashlib
 import itertools
 import os.path
+import readconfig
+import errno
 from time import sleep
 from certtools import *
 
@@ -165,8 +167,6 @@ def correct_tree_size(expected):
             return False
     return True
 
-import readconfig
-
 def mergestatus(configfile, localconfigfile):
     localconfig = readconfig.read_config(localconfigfile)
     config = readconfig.verify_and_read_config(configfile, localconfig["logadminkey"])
@@ -177,7 +177,6 @@ def mergestatus(configfile, localconfigfile):
     sthfile = mergedb + "/sth"
     currentsizefile = mergedb + "/fetched"
 
-    sth = json.loads(open(sthfile, "r").read())
     currentsize = json.loads(open(currentsizefile, "r").read())
     
     print >>sys.stderr, currentsize["index"]+1,
@@ -191,7 +190,12 @@ def mergestatus(configfile, localconfigfile):
             print >>sys.stderr, tree["tree_size"],
         except (IOError, ValueError):
             pass
-    print >>sys.stderr, sth["tree_size"],
+    try:
+        sth = json.loads(open(sthfile, "r").read())
+        print >>sys.stderr, sth["tree_size"],
+    except IOError, e:
+        if e.errno != errno.ENOENT:
+            raise
     print