summaryrefslogtreecommitdiff
path: root/ironic_python_agent/tests/unit
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-02 16:57:44 +0000
committerGerrit Code Review <review@openstack.org>2017-01-02 16:57:44 +0000
commita6b09f2fa85f397cfda6a43ce19c995c8a3be76d (patch)
treea028b19356b1eaef239c6a70cf59cdff3d130299 /ironic_python_agent/tests/unit
parentdbc647ceff2fe137a56e73fdb990a8dad63aef7b (diff)
parent81780adef861d7a2be6b198589cecc059f0d01a7 (diff)
downloadironic-python-agent-a6b09f2fa85f397cfda6a43ce19c995c8a3be76d.tar.gz
Merge "Use oslo_serialization.base64 to follow OpenStack Python3"
Diffstat (limited to 'ironic_python_agent/tests/unit')
-rw-r--r--ironic_python_agent/tests/unit/test_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic_python_agent/tests/unit/test_utils.py b/ironic_python_agent/tests/unit/test_utils.py
index ebfd3071..487e6aee 100644
--- a/ironic_python_agent/tests/unit/test_utils.py
+++ b/ironic_python_agent/tests/unit/test_utils.py
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import base64
import errno
import glob
import io
@@ -27,6 +26,7 @@ import testtools
from ironic_lib import utils as ironic_utils
import mock
from oslo_concurrency import processutils
+from oslo_serialization import base64
from oslotest import base as test_base
from ironic_python_agent import errors
@@ -386,7 +386,7 @@ class TestUtils(testtools.TestCase):
io_dict = {'fake-name': io.BytesIO(bytes(contents))}
data = utils.gzip_and_b64encode(io_dict=io_dict)
- res = io.BytesIO(base64.b64decode(data))
+ res = io.BytesIO(base64.decode_as_bytes(data))
with tarfile.open(fileobj=res) as tar:
members = [(m.name, m.size) for m in tar]
self.assertEqual([('fake-name', len(contents))], members)