summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional/object
diff options
context:
space:
mode:
authorSean McGinnis <sean.mcginnis@gmail.com>2018-04-10 14:32:33 -0500
committerMatt Riedemann <mriedem.os@gmail.com>2018-04-20 10:05:12 -0400
commitcc3dd2abe23b5363a963206e89371be493d43ad7 (patch)
treeef4376630b4d184312a87cd6696c456f14c9ede0 /openstackclient/tests/functional/object
parenta3caf7b331709d76fc6aec5222c60688fd6112a9 (diff)
downloadpython-openstackclient-cc3dd2abe23b5363a963206e89371be493d43ad7.tar.gz
Clean up W503 and E402 pep8 errors
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 (cherry picked from commit d60141525987bc973802b4ec9a3b027e071d1966)
Diffstat (limited to 'openstackclient/tests/functional/object')
-rw-r--r--openstackclient/tests/functional/object/v1/test_object.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/openstackclient/tests/functional/object/v1/test_object.py b/openstackclient/tests/functional/object/v1/test_object.py
index d1a73c54..226ef8ad 100644
--- a/openstackclient/tests/functional/object/v1/test_object.py
+++ b/openstackclient/tests/functional/object/v1/test_object.py
@@ -53,39 +53,39 @@ class ObjectTests(common.ObjectStoreTests):
self.openstack('container save ' + self.CONTAINER_NAME)
# TODO(stevemar): Assert returned fields
- raw_output = self.openstack('object create ' + self.CONTAINER_NAME
- + ' ' + object_file)
+ 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 ' + self.CONTAINER_NAME)
+ 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 ' + self.CONTAINER_NAME
- + ' ' + object_file)
+ 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 ' + self.CONTAINER_NAME
- + ' ' + object_file + ' --file ' + 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 ' + self.CONTAINER_NAME
- + ' ' + object_file + ' --file -')
+ raw_output = self.openstack('object save %s %s --file -' %
+ (self.CONTAINER_NAME, object_file))
self.assertEqual(raw_output, 'test content')
- self.openstack('object show ' + self.CONTAINER_NAME
- + ' ' + object_file)
+ self.openstack('object show %s %s' %
+ (self.CONTAINER_NAME, object_file))
# TODO(stevemar): Assert returned fields
- raw_output = self.openstack('object delete ' + self.CONTAINER_NAME
- + ' ' + object_file)
+ raw_output = self.openstack('object delete %s %s' %
+ (self.CONTAINER_NAME, object_file))
self.assertEqual(0, len(raw_output))
- self.openstack('object create ' + self.CONTAINER_NAME
- + ' ' + object_file)
- raw_output = self.openstack('container delete -r ' +
+ 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))