commit 7470b37625c55d852fee400095e5ddf3689b5070
author Kyle Mestery <mestery@mestery.com> Tue Aug 11 10:39:07 2015 +0000
committer Kyle Mestery <mestery@mestery.com> Tue Aug 11 10:39:40 2015 +0000
tree b976a3cec92ba6d214d0838f4103b33f7f05ff78
parent b8a5814fd9d357a52eb0d4f2d5f973db518becb8
parent 1eedd9ac1c185dbcab2ae48cc3d60f2f309f232e

Merge remote-tracking branch 'origin/master' into merge-branch

Change-Id: Ic237c09131f6579f3df1a3a10ba1e5f7a3d42bde

neutron/tests/tempest/common/generator/base_generator.py

diff --git a/neutron/tests/tempest/common/generator/base_generator.py b/neutron/tests/tempest/common/generator/base_generator.py
index 5ac927c..6db3f24 100644
--- a/neutron/tests/tempest/common/generator/base_generator.py
+++ b/neutron/tests/tempest/common/generator/base_generator.py
@@ -176,7 +176,7 @@
             expected_result = generator_result[2]
             element = path.pop()
             if len(path) > 0:
-                schema_snip = reduce(dict.get, path, schema)
+                schema_snip = six.moves.reduce(dict.get, path, schema)
                 schema_snip[element] = invalid_snippet
             else:
                 schema[element] = invalid_snippet