openstack/manila
Code Issues Proposed changes

Merge "Replace six.iteritems() with .items()"

Browse Source
This commit is contained in:
Jenkins 2016-12-09 18:18:04 +00:00 committed by Gerrit Code Review
commit ab3d1337f5
2 changed files with 2 additions and 3 deletions

2
manila_tempest_tests/tests/api/test_security_services.py

@ -95,7 +95,7 @@ class SecurityServiceListMixin(object):
self.assertTrue(any(self.ss_ldap['id'] == ss['id'] for ss in listed))
for ss in listed:
self.assertTrue(all(ss[key] == value for key, value
in six.iteritems(search_opts)))
in search_opts.items()))
class SecurityServicesTest(base.BaseSharesTest,

3
manila_tempest_tests/tests/api/test_share_networks.py

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
from tempest import config
import testtools
from testtools import testcase as tc
@ -93,7 +92,7 @@ class ShareNetworkListMixin(object):
created_since = valid_filter_opts.pop('created_since')
for sn in listed:
self.assertTrue(all(sn[key] == value for key, value in
six.iteritems(valid_filter_opts)))
valid_filter_opts.items()))
self.assertLessEqual(sn['created_at'], created_before)
self.assertGreaterEqual(sn['created_at'], created_since)