Merge lp:~cr3/checkbox/floppy_test into lp:checkbox

[Marc Tardif]

The changes in this merge request were not tested because nobody can find a freaking floppy drive and the only floppies we can find are under bladernr's washing machine.

[Daniel Manrique (roadmr)]

The code looks fine, it at least doesn't crash, and since we were unable to test this further I guess I'll merge it. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-21 16:03:50 +0000
+++ debian/changelog	2012-06-21 18:47:18 +0000
@@ -27,8 +27,9 @@
   * [FEATURE] Added new interactive and auto-verifying touchpad scrolling
     test.
   * [FEATURE] Python 2 to 3 conversion:
+    * scripts/ansi_parser
     * scripts/cking_suite
-    * scripts/ansi_parser
+    * scripts/floppy_test
     * scripts/network_bandwidth_test
   * Removed sleep_test script no longer used by any test definition.
 

=== modified file 'scripts/floppy_test'
--- scripts/floppy_test	2012-05-22 18:01:21 +0000
+++ scripts/floppy_test	2012-06-21 18:47:18 +0000
@@ -1,9 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import os
 import sys
 import filecmp
-import commands
+import subprocess
 import posixpath
 
 DEFAULT_DIR = "/tmp/checkbox.floppy"
@@ -28,9 +28,9 @@
     def run(self):
         floppyDevice = self.device
         if floppyDevice:
-            print "  Testing on floppy drive %s " % floppyDevice
+            print("  Testing on floppy drive %s " % floppyDevice)
         else:
-            print "  Error ! No floppy drive found !"
+            print("  Error ! No floppy drive found !")
             return 1
         # remove temp files if they exist
         os.system("umount /media/floppy 2>/dev/null")
@@ -51,45 +51,45 @@
         os.system("umount %s" % self.image_dir)
         # start testing
         (noFloppyDisk, junkOutput1) = \
-            commands.getstatusoutput("dd bs=1c if=%s count=0 2>/dev/null"
+            subprocess.getstatusoutput("dd bs=1c if=%s count=0 2>/dev/null"
                                      % floppyDevice)
         if noFloppyDisk != 0:
-            print "Error ! No floppy disc or bad media in %s !" % floppyDevice
+            print("Error ! No floppy disc or bad media in %s !" % floppyDevice)
             return 1
         else:
             # writing files
-            print "  Writing data to floppy disc ... "
+            print("  Writing data to floppy disc ... ")
             (ddStatus, ddOutput) = \
-                commands.getstatusoutput("dd if=%s of=%s bs=1k count=1440"
+                subprocess.getstatusoutput("dd if=%s of=%s bs=1k count=1440"
                                          % (self.image, floppyDevice))
             if ddStatus == 0:
-                print "  Write data to floppy disc done ! "
+                print("  Write data to floppy disc done ! ")
             else:
-                print "  Error ! Write data to floppy disc error ! "
-                print "  Please check if your floppy disc is write-protected !"
+                print("  Error ! Write data to floppy disc error ! ")
+                print("  Please check if your floppy disc is write-protected !")
                 return 1
             # comparing files
             os.system("mount %s %s" % (floppyDevice, self.device_dir))
             os.system("mount -o loop %s %s" % (self.image, self.image_dir))
-            print "  Comparing files ... "
+            print("  Comparing files ... ")
             fileList = os.listdir(self.image_dir)
             returnValue = 0
             for textFile in fileList:
                 file1 = os.path.join(self.device_dir, textFile)
                 file2 = os.path.join(self.image_dir, textFile)
                 if filecmp.cmp(file1, file2):
-                    print "        comparing file %s" % textFile
+                    print("        comparing file %s" % textFile)
                 else:
-                    print ("  --  Error ! File %s comparison failed ! -- "
-                           % textFile)
+                    print("  --  Error ! File %s comparison failed ! -- "
+                          % textFile)
                     returnValue = 1
-            print "  File comparison done ! "
+            print("  File comparison done ! ")
             # remove temp files
             os.system("umount /media/floppy 2>/dev/null")
             os.system("umount %s %s " % (self.image_dir, self.device_dir))
             os.system("rm -rf %s %s %s"
                       % (self.device_dir, self.image_dir, self.image))
-            print "Done !"
+            print("Done !")
             return returnValue