Catch more specific exceptions instead of any throwable
Conflicts:
TestON/drivers/common/cli/onosdriver.py
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 27c2d92..ea38f63 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1819,7 +1819,7 @@
except TypeError:
main.log.exception( self.name + ": Object not as expected" )
return None
- except:
+ except Exception:
main.log.exception( self.name + ": Uncaught exception!" )
main.cleanup()
main.exit()
@@ -1853,8 +1853,7 @@
except AssertionError:
main.log.error("Incorrect Config settings: " + verification)
-
- except:
+ except Exception:
main.log.exception( self.name + ": Uncaught exception!" )
main.cleanup()
main.exit()
@@ -1888,12 +1887,10 @@
main.log.error( self.name + ": " + self.handle.before )
main.cleanup()
main.exit()
-
except AssertionError:
main.log.info("Settings did not post to ONOS")
main.log.error(varification)
-
- except:
+ except Exception:
main.log.exception( self.name + ": Uncaught exception!" )
main.log.error(varification)
main.cleanup()