Commit 03e18810 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

tests: Use Python 2.6 "except E as ..." syntax 



PEP 8 calls for it, because it's forward compatible with Python 3.
Supported since Python 2.6, which we require (commit fec21036).

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-Id: <1450425164-24969-5-git-send-email-armbru@redhat.com>
parent 86b227d9

tests/image-fuzzer/runner.py

+6 −6
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ class TestEnv(object): 


        try:

            os.makedirs(self.current_dir)

        except OSError, e:

        except OSError as e:

            print >>sys.stderr, \

                "Error: The working directory '%s' cannot be used. Reason: %s"\

                % (self.work_dir, e[1])
@@ -244,7 +244,7 @@ class TestEnv(object): 
            temp_log = StringIO.StringIO()

            try:

                retcode = run_app(temp_log, current_cmd)

            except OSError, e:

            except OSError as e:

                multilog("%sError: Start of '%s' failed. Reason: %s\n\n"

                         % (test_summary, os.path.basename(current_cmd[0]),

                            e[1]),
@@ -356,7 +356,7 @@ if __name__ == '__main__': 
        opts, args = getopt.gnu_getopt(sys.argv[1:], 'c:hs:kvd:',

                                       ['command=', 'help', 'seed=', 'config=',

                                        'keep_passed', 'verbose', 'duration='])

    except getopt.error, e:

    except getopt.error as e:

        print >>sys.stderr, \

            "Error: %s\n\nTry 'runner.py --help' for more information" % e

        sys.exit(1)
@@ -374,7 +374,7 @@ if __name__ == '__main__': 
        elif opt in ('-c', '--command'):

            try:

                command = json.loads(arg)

            except (TypeError, ValueError, NameError), e:

            except (TypeError, ValueError, NameError) as e:

                print >>sys.stderr, \

                    "Error: JSON array of test commands cannot be loaded.\n" \

                    "Reason: %s" % e
@@ -390,7 +390,7 @@ if __name__ == '__main__': 
        elif opt == '--config':

            try:

                config = json.loads(arg)

            except (TypeError, ValueError, NameError), e:

            except (TypeError, ValueError, NameError) as e:

                print >>sys.stderr, \

                    "Error: JSON array with the fuzzer configuration cannot" \

                    " be loaded\nReason: %s" % e
@@ -414,7 +414,7 @@ if __name__ == '__main__': 


    try:

        image_generator = __import__(generator_name)

    except ImportError, e:

    except ImportError as e:

        print >>sys.stderr, \

            "Error: The image generator '%s' cannot be imported.\n" \

            "Reason: %s" % (generator_name, e)

tests/qemu-iotests/qed.py

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ def main(): 
    qed = QED(open(filename, 'r+b'))

    try:

        globals()[cmd](qed, *sys.argv[3:])

    except TypeError, e:

    except TypeError as e:

        sys.stderr.write(globals()[cmd].__doc__ + '\n')

        sys.exit(1)