Various fixes -- test still failing though

auto/backup/uploader.go

@@ -49,7 +49,7 @@ const (
 	numUploadsOK         = "num_uploads_ok"
 	numUploadsFail       = "num_uploads_fail"
 	numUploadsSkipped    = "num_uploads_skipped"
-	numUploadsSkippedSum = "num_uploads_skippedSum"
+	numUploadsSkippedSum = "num_uploads_skipped_sum"
 	totalUploadBytes     = "total_upload_bytes"
 	lastUploadBytes      = "last_upload_bytes"
 

system_test/e2e/helpers.py

@@ -373,12 +373,12 @@ class Node(object):
 
   def num_auto_backups(self):
     '''
-    Return a tuple of the number of successful, failed, skipped auto-backups.
+    Return a tuple of the number of successful, failed, skipped auto-backups, skipped sum auto-backups.
     '''
     return (int(self.expvar()['uploader']['num_uploads_ok']),
             int(self.expvar()['uploader']['num_uploads_fail']),
-            int(self.expvar()['uploader']['num_uploads_skipped'],
-             int(self.expvar()['uploader']['num_uploads_skipped_sum'])))
+            int(self.expvar()['uploader']['num_uploads_skipped']),
+            int(self.expvar()['uploader']['num_uploads_skipped_sum']))
 
   def wait_for_upload(self, i, timeout=TIMEOUT):
     '''
@@ -391,7 +391,7 @@ class Node(object):
       time.sleep(1)
       t+=1
     n = self.num_auto_backups()
-    raise Exception('rqlite node failed to upload backup within %d seconds (%d, %d, %d)' % (timeout, n[0], n[1], n[2], n[3]))
+    raise Exception('rqlite node failed to upload backup within %d seconds (%d, %d, %d, %d)' % (timeout, n[0], n[1], n[2], n[3]))
 
   def wait_for_upload_skipped_sum(self, i, timeout=TIMEOUT):
     '''
@@ -404,7 +404,7 @@ class Node(object):
       time.sleep(1)
       t+=1
     n = self.num_auto_backups()
-    raise Exception('rqlite node failed to skip backup within %d seconds (%d, %d, %d)' % (timeout, n[0], n[1], n[2], n[3]))
+    raise Exception('rqlite node failed to skip backup within %d seconds (%d, %d, %d, %d)' % (timeout, n[0], n[1], n[2], n[3]))
 
   def wait_for_fsm_index(self, index, timeout=TIMEOUT):
     '''