← Back to branch summary

~ltrager/maas/lp1554636_2.0

« back to all changes in this revision

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

Merge Blake's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/tests/test_licensekey.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 import forms
19
18
from maasserver.testing.factory import factory
20
19
from maasserver.testing.orm import reload_object
21
20
from maasserver.testing.osystems import patch_usable_osystems
 
21
from maasserver.utils.converters import json_load_bytes
22
22
from maasserver.utils.orm import get_one
23
23
 
24
24
 
61
61
            self.get_url(license_key.osystem, license_key.distro_series))
62
62
        self.assertEqual(http.client.OK, response.status_code)
63
63
 
64
 
        parsed_result = json.loads(response.content)
 
64
        parsed_result = json_load_bytes(response.content)
65
65
        self.assertEqual(
66
66
            (
67
67
                license_key.osystem,
158
158
        self.assertEqual(
159
159
            http.client.OK, response.status_code, response.content)
160
160
 
161
 
        parsed_result = json.loads(response.content)
 
161
        parsed_result = json_load_bytes(response.content)
162
162
        self.assertEqual(1, len(parsed_result))
163
163
        [returned_network] = parsed_result
164
164
        fields = {'osystem', 'distro_series', 'license_key'}
185
185
        response = self.client.get(reverse('license_keys_handler'))
186
186
        self.assertEqual(
187
187
            http.client.OK, response.status_code, response.content)
188
 
        self.assertEqual([], json.loads(response.content))
 
188
        self.assertEqual([], json_load_bytes(response.content))
189
189
 
190
190
    def test_POST_creates_license_key(self):
191
191
        self.become_admin()