Merge "Convert all strings into unicode in services reconfiguration module" into stable/mitaka

This commit is contained in:
Jenkins 2016-09-05 05:19:07 +00:00 committed by Gerrit Code Review
commit 79cb36faed

View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import unicode_literals
import random import random
import time import time
import traceback import traceback
@ -241,8 +243,8 @@ class ServicesReconfiguration(TestBasic):
cmd="mount", cmd="mount",
auth=cirros_auth auth=cirros_auth
) )
asserts.assert_true('/mnt type {0}'.format(fs_type) test_substr = '/mnt type {0}'.format(fs_type)
in res['stdout'], asserts.assert_true(test_substr in res['stdout_str'],
"Ephemeral disk format was not " "Ephemeral disk format was not "
"changed on instance. " "changed on instance. "
"Please, see details: {0}".format(res)) "Please, see details: {0}".format(res))