diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-11 18:44:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-11 18:44:30 +0000 |
| commit | c8354b8d8310dce9b0296597e41f9a355d7067c0 (patch) | |
| tree | 4faf50aad3e5cedaa23e4aeabff215f3eb2b0238 /openstackclient | |
| parent | 9aa207eb9d66ae3240606a9b497b253b37566c95 (diff) | |
| parent | 8aa0b07fbc4dd3cd2c7d99513407b652eaa39d85 (diff) | |
| download | python-openstackclient-c8354b8d8310dce9b0296597e41f9a355d7067c0.tar.gz | |
Merge "Fix misspellings in python openstackclient"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/openstackkeyring.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v1/fakes.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v1/test_volume.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py index e60ce71c..115e5644 100644 --- a/openstackclient/common/openstackkeyring.py +++ b/openstackclient/common/openstackkeyring.py @@ -37,7 +37,7 @@ class OpenstackKeyring(keyring.backends.file.BaseKeyring): block_size = 32 padding = '0' - # init the cipher with the class name, upto block_size + # init the cipher with the class name, up to block_size password = __name__[block_size:] password = password + (block_size - len(password) % block_size) * padding diff --git a/openstackclient/tests/volume/v1/fakes.py b/openstackclient/tests/volume/v1/fakes.py index b25dfaf7..d6ef0d39 100644 --- a/openstackclient/tests/volume/v1/fakes.py +++ b/openstackclient/tests/volume/v1/fakes.py @@ -32,7 +32,7 @@ VOLUME = { 'display_description': volume_description, 'size': volume_size, 'status': '', - 'attach_status': 'detatched', + 'attach_status': 'detached', 'metadata': volume_metadata, } diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py index 4e033dfe..554e2b2a 100644 --- a/openstackclient/tests/volume/v1/test_volume.py +++ b/openstackclient/tests/volume/v1/test_volume.py @@ -105,7 +105,7 @@ class TestVolumeCreate(TestVolume): ) self.assertEqual(columns, collist) datalist = ( - 'detatched', + 'detached', volume_fakes.volume_description, volume_fakes.volume_name, volume_fakes.volume_id, @@ -181,7 +181,7 @@ class TestVolumeCreate(TestVolume): ) self.assertEqual(columns, collist) datalist = ( - 'detatched', + 'detached', volume_fakes.volume_description, volume_fakes.volume_name, volume_fakes.volume_id, @@ -257,7 +257,7 @@ class TestVolumeCreate(TestVolume): ) self.assertEqual(columns, collist) datalist = ( - 'detatched', + 'detached', volume_fakes.volume_description, volume_fakes.volume_name, volume_fakes.volume_id, |