Unit tests fail with new jsonschema 2.4.0

[Andrew Lazarev]

Steps to repro:

1. Update jsonschema to 2.4.0 (line from requirements: "jsonschema>=2.0.0,<3.0.0")
2. run unit tests

I see two problems:
1. tests fail
2. expected and actual results swapped

Result:
Traceback (most recent call last):
  File "/Users/andrew/Sahara/sahara/sahara/tests/unit/service/validation/test_ng_template_validation_create.py", line 145, in test_ng_template_create_v_minimum_ints
    u'-1.0 is less than the minimum of 0')
  File "/Users/andrew/Sahara/sahara/.tox/py27/lib/python2.7/site-packages/mock.py", line 1201, in patched
    return func(*args, **keywargs)
  File "sahara/tests/unit/service/validation/utils.py", line 274, in _assert_create_object_validation
    self._assert_calls(bad_req, bad_req_i)
  File "sahara/tests/unit/service/validation/utils.py", line 258, in _assert_calls
    self.assertEqual(mock.call_args[0][0].message, call_info[2])
  File "/Users/andrew/Sahara/sahara/.tox/py27/lib/python2.7/site-packages/testtools/testcase.py", line 321, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/Users/andrew/Sahara/sahara/.tox/py27/lib/python2.7/site-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: !=:
reference = '-1 is less than the minimum of 0'
actual = u'-1.0 is less than the minimum of 0'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/115946

[Sergey Lukjanov (slukjanov)]

The correct solution is to make our unit tests work with both versions of jsonschema.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/115946
Committed: https://git.openstack.org/cgit/openstack/sahara/commit/?id=822c2f053f8aef6d75e82631c7881cb64b7fa0a7
Submitter: Jenkins
Branch: master

commit 822c2f053f8aef6d75e82631c7881cb64b7fa0a7
Author: Sergey Lukjanov <email address hidden>
Date: Thu Aug 21 15:37:08 2014 +0400

    Fix jsonschema>=2.4.0 message assertion

    The jsonschema 2.4.0 release slightly changed some of the error messages
    that are provided when validation fails. This patch updates the unit tests to
    expect the proper string and avoid failing as a result by using regex
    (.0)? instead of specific value.

    Change-Id: Ifd41147fd6157038b102c78144d1f6cb16cc25e6
    Closes-bug: #1359284

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/121521

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/121521
Committed: https://git.openstack.org/cgit/openstack/sahara/commit/?id=03ef7dd4a28b976e6b853aa70bf81ac3f68f46a0
Submitter: Jenkins
Branch: stable/icehouse

commit 03ef7dd4a28b976e6b853aa70bf81ac3f68f46a0
Author: Sergey Lukjanov <email address hidden>
Date: Thu Aug 21 15:37:08 2014 +0400

    Fix jsonschema>=2.4.0 message assertion

    The jsonschema 2.4.0 release slightly changed some of the error messages
    that are provided when validation fails. This patch updates the unit tests to
    expect the proper string and avoid failing as a result by using regex
    (.0)? instead of specific value.

    Change-Id: Ifd41147fd6157038b102c78144d1f6cb16cc25e6
    Closes-bug: #1359284
    (cherry picked from commit 822c2f053f8aef6d75e82631c7881cb64b7fa0a7)