diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-03-13 20:06:47 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-03-14 18:39:06 +0100 |
| commit | e12cf38ae9249fbf89913e015266d3569d911deb (patch) | |
| tree | c3634e88e38609df2c1fc02511094f443fb1c083 | |
| parent | 1999c0a00aec9736a58a235d90c9ef5a6f9cff34 (diff) | |
[2.1.x] Fixed serializers tests for PyYAML 5.1+.
Backport of a57c783dd4e6dc73847081221827a1902eede88b from master
| -rw-r--r-- | tests/serializers/test_yaml.py | 4 | ||||
| -rw-r--r-- | tests/timezones/tests.py | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/serializers/test_yaml.py b/tests/serializers/test_yaml.py index e876597e9d..dbcbd57003 100644 --- a/tests/serializers/test_yaml.py +++ b/tests/serializers/test_yaml.py @@ -115,7 +115,9 @@ class YamlSerializerTestCase(SerializersTestBase, TestCase): author: %(author_pk)s headline: Poker has no place on ESPN pub_date: 2006-06-16 11:00:00 - categories: [%(first_category_pk)s, %(second_category_pk)s] + categories:""" + ( + ' [%(first_category_pk)s, %(second_category_pk)s]' if yaml.__version__ < '5.1' + else '\n - %(first_category_pk)s\n - %(second_category_pk)s') + """ meta_data: [] """ diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 430eddb04e..2dd1872899 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -642,7 +642,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) @@ -666,7 +666,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30.405060") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt, dt) @@ -690,7 +690,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 17:20:30.405060+07:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -714,7 +714,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 10:20:30+00:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -738,7 +738,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 13:20:30+03:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) @@ -762,7 +762,7 @@ class SerializationTests(SimpleTestCase): self.assertEqual(obj.dt, dt) if not isinstance(serializers.get_serializer('yaml'), serializers.BadSerializer): - data = serializers.serialize('yaml', [Event(dt=dt)]) + data = serializers.serialize('yaml', [Event(dt=dt)], default_flow_style=None) self.assert_yaml_contains_datetime(data, "2011-09-01 17:20:30+07:00") obj = next(serializers.deserialize('yaml', data)).object self.assertEqual(obj.dt.replace(tzinfo=UTC), dt) |