diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-24 17:58:18 +0200 |
commit | 81156aa423309c72f17709eea994e7e06ebc431c (patch) | |
tree | 4ee78fb024c5f03a3c12e39e1adfc1b0cb84063b /tests/unittests/test_cli.py | |
parent | 14040a9c8df6e8406acb79fd653873bb05cb4d40 (diff) | |
parent | ea4bc2c603a9d964a918e01d00e39a851e979830 (diff) | |
download | vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.tar.gz vyos-cloud-init-81156aa423309c72f17709eea994e7e06ebc431c.zip |
rebased with upstream and reolved merge conflicts
Diffstat (limited to 'tests/unittests/test_cli.py')
-rw-r--r-- | tests/unittests/test_cli.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py index ed863399..f537bd83 100644 --- a/tests/unittests/test_cli.py +++ b/tests/unittests/test_cli.py @@ -1,7 +1,7 @@ import imp import os -import sys import six +import sys from . import helpers as test_helpers @@ -31,7 +31,7 @@ class TestCLI(test_helpers.FilesystemMockingTestCase): 'cli', open(BIN_CLOUDINIT), '', ('', 'r', imp.PY_SOURCE)) try: return cli.main() - except: + except Exception: pass @test_helpers.skipIf(not os.path.isfile(BIN_CLOUDINIT), "no bin/cloudinit") |