diff options
author | Takashi Kajinami <tkajinam@redhat.com> | 2020-04-20 17:48:17 +0900 |
---|---|---|
committer | Douglas Mendizábal <dmendiza@redhat.com> | 2020-06-08 15:40:22 -0500 |
commit | 6420da336083d936da9a4563149b08d785d70c84 (patch) | |
tree | 9cf7c2ce2cff5e7352d7b35a1dcee3bf675534e4 /functionaltests/cli/v1/behaviors/base_behaviors.py | |
parent | e5fdd10f04488d6f6e252a63c57bf2be92a06c8f (diff) | |
download | python-barbicanclient-6420da336083d936da9a4563149b08d785d70c84.tar.gz |
Fix gate job failures and py3 compatibility
- Fix incorrect type handling of secret payload in py3
(it should be bytes instead of str by default)
- Fix py3 compatibility of test codes
- Update expiration date so that resources are created with valid
expiration.
Change-Id: I4935f601f87e9c49499da1034a320eee2e655b4d
Diffstat (limited to 'functionaltests/cli/v1/behaviors/base_behaviors.py')
-rw-r--r-- | functionaltests/cli/v1/behaviors/base_behaviors.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/functionaltests/cli/v1/behaviors/base_behaviors.py b/functionaltests/cli/v1/behaviors/base_behaviors.py index 4d24c5b..1c81723 100644 --- a/functionaltests/cli/v1/behaviors/base_behaviors.py +++ b/functionaltests/cli/v1/behaviors/base_behaviors.py @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -import exceptions as exc import logging import re import six @@ -88,7 +87,7 @@ class BaseBehaviors(object): self.cmdline_client.stdout = six.StringIO() self.cmdline_client.stderr = six.StringIO() self.cmdline_client.run(argv) - except exc.SystemExit: + except SystemExit: pass outstr = self.cmdline_client.stdout.getvalue() |