d601415259
pycodestyle 2.40 and later enforce these rules that were not previously enforced. Rather than just skipping them, this cleans up the trivial instances of these violations. This does also include some other updates that were not triggering errors in an attempt to keep some of the style consistent. Change-Id: Id7c0a6b8f1f835e69d844b000e3ed751852ada63 Closes-bug: #1762803
92 lines
3.5 KiB
Python
92 lines
3.5 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, 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 os
|
|
import tempfile
|
|
import uuid
|
|
|
|
from openstackclient.tests.functional.object.v1 import common
|
|
|
|
BASIC_LIST_HEADERS = ['Name']
|
|
CONTAINER_FIELDS = ['account', 'container', 'x-trans-id']
|
|
OBJECT_FIELDS = ['object', 'container', 'etag']
|
|
|
|
|
|
class ObjectTests(common.ObjectStoreTests):
|
|
"""Functional tests for Object Store object commands"""
|
|
|
|
CONTAINER_NAME = uuid.uuid4().hex
|
|
|
|
def setUp(self):
|
|
super(ObjectTests, self).setUp()
|
|
# Skip tests if no object-store is present
|
|
if not self.haz_object_store:
|
|
self.skipTest("No object-store service present")
|
|
|
|
def test_object(self):
|
|
with tempfile.NamedTemporaryFile() as f:
|
|
f.write('test content')
|
|
f.flush()
|
|
self._test_object(f.name)
|
|
|
|
def _test_object(self, object_file):
|
|
raw_output = self.openstack('container create ' + self.CONTAINER_NAME)
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_show_fields(items, CONTAINER_FIELDS)
|
|
|
|
raw_output = self.openstack('container list')
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_table_structure(items, BASIC_LIST_HEADERS)
|
|
|
|
self.openstack('container show ' + self.CONTAINER_NAME)
|
|
# TODO(stevemar): Assert returned fields
|
|
|
|
self.openstack('container save ' + self.CONTAINER_NAME)
|
|
# TODO(stevemar): Assert returned fields
|
|
|
|
raw_output = self.openstack('object create %s %s' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_show_fields(items, OBJECT_FIELDS)
|
|
|
|
raw_output = self.openstack('object list %s' % self.CONTAINER_NAME)
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_table_structure(items, BASIC_LIST_HEADERS)
|
|
|
|
self.openstack('object save %s %s' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
# TODO(stevemar): Assert returned fields
|
|
|
|
tmp_file = 'tmp.txt'
|
|
self.addCleanup(os.remove, tmp_file)
|
|
self.openstack('object save %s %s --file %s' %
|
|
(self.CONTAINER_NAME, object_file, tmp_file))
|
|
# TODO(stevemar): Assert returned fields
|
|
|
|
raw_output = self.openstack('object save %s %s --file -' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
self.assertEqual(raw_output, 'test content')
|
|
|
|
self.openstack('object show %s %s' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
# TODO(stevemar): Assert returned fields
|
|
|
|
raw_output = self.openstack('object delete %s %s' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
self.assertEqual(0, len(raw_output))
|
|
|
|
self.openstack('object create %s %s' %
|
|
(self.CONTAINER_NAME, object_file))
|
|
raw_output = self.openstack('container delete -r %s' %
|
|
self.CONTAINER_NAME)
|
|
self.assertEqual(0, len(raw_output))
|