Message ID | 20230215132547.1620575-3-vsementsov@yandex-team.ru |
---|---|
State | New |
Headers | show |
Series | iotests: use vm.cmd() | expand |
On Wed, Feb 15, 2023 at 8:26 AM Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> wrote: > > Now 'make check-dev' called in python/ directory raises several > > W0719: Raising too general exception: Exception (broad-exception-raised) > > Let's fix. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> I think I came to the same conclusions: https://gitlab.com/jsnow/qemu/-/commit/19bac2ea70cbb5ada4f94d6223cdc96f51a2b3d9 Reviewed-by: John Snow <jsnow@redhat.com> > --- > python/qemu/utils/qemu_ga_client.py | 6 +++--- > tests/qemu-iotests/iotests.py | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py > index 8c38a7ac9c..d8411bb2d0 100644 > --- a/python/qemu/utils/qemu_ga_client.py > +++ b/python/qemu/utils/qemu_ga_client.py > @@ -155,7 +155,7 @@ def ping(self, timeout: Optional[float]) -> bool: > > def fsfreeze(self, cmd: str) -> object: > if cmd not in ['status', 'freeze', 'thaw']: > - raise Exception('Invalid command: ' + cmd) > + raise ValueError('Invalid command: ' + cmd) > # Can be int (freeze, thaw) or GuestFsfreezeStatus (status) > return getattr(self.qga, 'fsfreeze' + '_' + cmd)() > > @@ -167,7 +167,7 @@ def fstrim(self, minimum: int) -> Dict[str, object]: > > def suspend(self, mode: str) -> None: > if mode not in ['disk', 'ram', 'hybrid']: > - raise Exception('Invalid mode: ' + mode) > + raise ValueError('Invalid mode: ' + mode) > > try: > getattr(self.qga, 'suspend' + '_' + mode)() > @@ -178,7 +178,7 @@ def suspend(self, mode: str) -> None: > > def shutdown(self, mode: str = 'powerdown') -> None: > if mode not in ['powerdown', 'halt', 'reboot']: > - raise Exception('Invalid mode: ' + mode) > + raise ValueError('Invalid mode: ' + mode) > > try: > self.qga.shutdown(mode=mode) > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 94aeb3f3b2..3e82c634cf 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -720,7 +720,7 @@ def __exit__(self, exc_type, value, traceback): > signal.setitimer(signal.ITIMER_REAL, 0) > return False > def timeout(self, signum, frame): > - raise Exception(self.errmsg) > + raise TimeoutError(self.errmsg) > > def file_pattern(name): > return "{0}-{1}".format(os.getpid(), name) > @@ -804,7 +804,7 @@ def remote_filename(path): > elif imgproto == 'ssh': > return "ssh://%s@127.0.0.1:22%s" % (os.environ.get('USER'), path) > else: > - raise Exception("Protocol %s not supported" % (imgproto)) > + raise ValueError("Protocol %s not supported" % (imgproto)) > > class VM(qtest.QEMUQtestMachine): > '''A QEMU VM''' > -- > 2.34.1 >
diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py index 8c38a7ac9c..d8411bb2d0 100644 --- a/python/qemu/utils/qemu_ga_client.py +++ b/python/qemu/utils/qemu_ga_client.py @@ -155,7 +155,7 @@ def ping(self, timeout: Optional[float]) -> bool: def fsfreeze(self, cmd: str) -> object: if cmd not in ['status', 'freeze', 'thaw']: - raise Exception('Invalid command: ' + cmd) + raise ValueError('Invalid command: ' + cmd) # Can be int (freeze, thaw) or GuestFsfreezeStatus (status) return getattr(self.qga, 'fsfreeze' + '_' + cmd)() @@ -167,7 +167,7 @@ def fstrim(self, minimum: int) -> Dict[str, object]: def suspend(self, mode: str) -> None: if mode not in ['disk', 'ram', 'hybrid']: - raise Exception('Invalid mode: ' + mode) + raise ValueError('Invalid mode: ' + mode) try: getattr(self.qga, 'suspend' + '_' + mode)() @@ -178,7 +178,7 @@ def suspend(self, mode: str) -> None: def shutdown(self, mode: str = 'powerdown') -> None: if mode not in ['powerdown', 'halt', 'reboot']: - raise Exception('Invalid mode: ' + mode) + raise ValueError('Invalid mode: ' + mode) try: self.qga.shutdown(mode=mode) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 94aeb3f3b2..3e82c634cf 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -720,7 +720,7 @@ def __exit__(self, exc_type, value, traceback): signal.setitimer(signal.ITIMER_REAL, 0) return False def timeout(self, signum, frame): - raise Exception(self.errmsg) + raise TimeoutError(self.errmsg) def file_pattern(name): return "{0}-{1}".format(os.getpid(), name) @@ -804,7 +804,7 @@ def remote_filename(path): elif imgproto == 'ssh': return "ssh://%s@127.0.0.1:22%s" % (os.environ.get('USER'), path) else: - raise Exception("Protocol %s not supported" % (imgproto)) + raise ValueError("Protocol %s not supported" % (imgproto)) class VM(qtest.QEMUQtestMachine): '''A QEMU VM'''
Now 'make check-dev' called in python/ directory raises several W0719: Raising too general exception: Exception (broad-exception-raised) Let's fix. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> --- python/qemu/utils/qemu_ga_client.py | 6 +++--- tests/qemu-iotests/iotests.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)