From 99d860cae837522495fc26a942afe0fc655ac21c Mon Sep 17 00:00:00 2001 From: Nisar Khan Date: Mon, 23 Sep 2024 04:35:17 +0000 Subject: [PATCH] Add Caracal Support Change-Id: Ie0a6c7e23a7950105b49d163ac2cc58e3a872e13 --- .zuul.yaml | 20 ++++++++++---------- gbpclient/tests/unit/test_cli20.py | 17 ++++------------- tox.ini | 2 +- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 2090260..dbabf6d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -14,42 +14,42 @@ - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py39: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py310: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py311: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 gate: jobs: - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py39: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py310: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 - openstack-tox-py311: required-projects: - name: openstack/requirements - override-checkout: stable/2023.2 + override-checkout: stable/2024.1 diff --git a/gbpclient/tests/unit/test_cli20.py b/gbpclient/tests/unit/test_cli20.py index 531e4c1..4e2ab0e 100644 --- a/gbpclient/tests/unit/test_cli20.py +++ b/gbpclient/tests/unit/test_cli20.py @@ -28,6 +28,7 @@ from gbpclient.v2_0 import client from neutronclient.common import constants from neutronclient.common import exceptions from neutronclient.tests.unit import test_http +from openstackclient.tests.unit import fakes API_VERSION = "2.0" TOKEN = test_http.AUTH_TOKEN @@ -50,19 +51,9 @@ class ParserException(Exception): pass -class FakeStdout(object): - - def __init__(self): - self.content = [] - - def write(self, text): - self.content.append(text) - - def make_string(self): - result = '' - for line in self.content: - result += encodeutils.safe_decode(line, 'utf-8') - return result +class FakeStdout(fakes.FakeStdout): + def isatty(self): + return True class MyRequest(requests.Request): diff --git a/tox.ini b/tox.ini index b53c07a..3300c1c 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs}