← Back to branch summary

~ltrager/maas/lp1554636_2.0

« back to all changes in this revision

Viewing changes to src/maasserver/api/tests/test_fabrics.py

Merge Blake's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/tests/test_fabrics.py
6
6
__all__ = []
7
7
 
8
8
import http.client
9
 
import json
10
9
import random
11
10
 
12
11
from django.core.urlresolvers import reverse
14
13
from maasserver.testing.api import APITestCase
15
14
from maasserver.testing.factory import factory
16
15
from maasserver.testing.orm import reload_object
 
16
from maasserver.utils.converters import json_load_bytes
17
17
from testtools.matchers import (
18
18
    ContainsDict,
19
19
    Equals,
51
51
            ]
52
52
        result_ids = [
53
53
            fabric["id"]
54
 
            for fabric in json.loads(response.content)
 
54
            for fabric in json_load_bytes(response.content)
55
55
            ]
56
56
        self.assertItemsEqual(expected_ids, result_ids)
57
57
 
64
64
        })
65
65
        self.assertEqual(
66
66
            http.client.OK, response.status_code, response.content)
67
 
        self.assertEqual(fabric_name, json.loads(response.content)['name'])
 
67
        self.assertEqual(
 
68
            fabric_name, json_load_bytes(response.content)['name'])
68
69
 
69
70
    def test_create_admin_only(self):
70
71
        fabric_name = factory.make_name("fabric")
94
95
 
95
96
        self.assertEqual(
96
97
            http.client.OK, response.status_code, response.content)
97
 
        parsed_fabric = json.loads(response.content)
 
98
        parsed_fabric = json_load_bytes(response.content)
98
99
        self.assertThat(parsed_fabric, ContainsDict({
99
100
            "id": Equals(fabric.id),
100
101
            "name": Equals(fabric.get_name()),
125
126
        })
126
127
        self.assertEqual(
127
128
            http.client.OK, response.status_code, response.content)
128
 
        self.assertEqual(new_name, json.loads(response.content)['name'])
 
129
        self.assertEqual(new_name, json_load_bytes(response.content)['name'])
129
130
        self.assertEqual(new_name, reload_object(fabric).name)
130
131
 
131
132
    def test_update_admin_only(self):