← Back to branch summary

~ltrager/maas/lp1554636_2.0

« back to all changes in this revision

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

Merge Blake's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/tests/test_network.py
6
6
__all__ = []
7
7
 
8
8
import http.client
9
 
import json
10
9
 
11
10
from django.core.urlresolvers import reverse
12
11
from maasserver.api.networks import convert_to_network_name
17
16
)
18
17
from maasserver.testing.api import APITestCase
19
18
from maasserver.testing.factory import factory
 
19
from maasserver.utils.converters import json_load_bytes
20
20
 
21
21
 
22
22
class TestNetwork(APITestCase):
44
44
        response = self.client.get(self.get_url(subnet))
45
45
        self.assertEqual(http.client.OK, response.status_code)
46
46
 
47
 
        parsed_result = json.loads(response.content)
 
47
        parsed_result = json_load_bytes(response.content)
48
48
        cidr = subnet.get_ipnetwork()
49
49
        self.assertEqual(
50
50
            (
143
143
            'network_handler', args=[convert_to_network_name(subnet)])
144
144
        response = self.client.get(url, {'op': 'list_connected_macs'})
145
145
        self.assertEqual(http.client.OK, response.status_code)
146
 
        return json.loads(response.content)
 
146
        return json_load_bytes(response.content)
147
147
 
148
148
    def extract_macs(self, returned_macs):
149
149
        """Extract the textual MAC addresses from an API response."""