[Checkins] SVN: relstorage/trunk/relstorage/ Fixed test failures and simplified the reporting units.

[Shane Hathaway]

Log message for revision 119946:
  Fixed test failures and simplified the reporting units.
  

Changed:
  U   relstorage/trunk/relstorage/tests/test_zodbconvert.py
  U   relstorage/trunk/relstorage/zodbconvert.py

-=-
Modified: relstorage/trunk/relstorage/tests/test_zodbconvert.py
===================================================================
--- relstorage/trunk/relstorage/tests/test_zodbconvert.py	2011-01-26 14:02:14 UTC (rev 119945)
+++ relstorage/trunk/relstorage/tests/test_zodbconvert.py	2011-01-26 14:15:34 UTC (rev 119946)
@@ -75,7 +75,7 @@
         conn.close()
         db.close()
 
-        main(['', self.cfgfile], write=lambda x: None)
+        main(['', self.cfgfile])
 
         dest = FileStorage(self.destfile)
         db2 = DB(dest)
@@ -99,7 +99,7 @@
         conn.close()
         db.close()
 
-        main(['', '--dry-run', self.cfgfile], write=lambda x: None)
+        main(['', '--dry-run', self.cfgfile])
 
         dest = FileStorage(self.destfile)
         db2 = DB(dest)
@@ -123,8 +123,7 @@
         db = DB(dest)  # create the root object
         db.close()
 
-        self.assertRaises(SystemExit, main, ['', self.cfgfile],
-            write=lambda x: None)
+        self.assertRaises(SystemExit, main, ['', self.cfgfile])
 
 def test_suite():
     suite = unittest.TestSuite()

Modified: relstorage/trunk/relstorage/zodbconvert.py
===================================================================
--- relstorage/trunk/relstorage/zodbconvert.py	2011-01-26 14:02:14 UTC (rev 119945)
+++ relstorage/trunk/relstorage/zodbconvert.py	2011-01-26 14:15:34 UTC (rev 119946)
@@ -112,9 +112,9 @@
         source.close()
         destination.close()
 
-        rate = (size / float(1024 * 1024)) / elapsed
+        rate = (size / 1e6) / elapsed
         log.info("All %d transactions copied successfully in %4.1f minutes "
-                 "at %1.3fmB/s.", num_txns, elapsed / 60, rate)
+                 "at %1.3f MB/s.", num_txns, elapsed / 60, rate)
 
 
 if __name__ == '__main__':