← Back to branch summary

~hazmat/pyjuju/rapi-delta

« back to all changes in this revision

Viewing changes to juju/providers/ec2/tests/test_launch.py

  • Committer: Kapil Thangavelu
  • Date: 2012-09-19 20:38:44 UTC
  • mfrom: (573.1.6 rest-context)
  • Revision ID: kapil@canonical.com-20120919203844-dc2pf82ttm7xj3xs
Merged rest-context into rapi-delta.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/providers/ec2/tests/test_launch.py
1
1
import os
2
2
 
3
 
import yaml
4
 
 
5
3
from twisted.internet.defer import inlineCallbacks, succeed
6
4
 
7
5
from txaws.ec2.model import Instance, SecurityGroup
9
7
from juju.errors import EnvironmentNotFound, ProviderError
10
8
from juju.providers.ec2.machine import EC2ProviderMachine
11
9
 
 
10
from juju.lib import serializer
12
11
from juju.lib.testing import TestCase
13
12
from juju.lib.mocker import MATCH
14
13
 
37
36
        def verify_user_data(data):
38
37
            expect_path = os.path.join(DATA_DIR, cloud_init)
39
38
            with open(expect_path) as f:
40
 
                expect_cloud_init = yaml.load(f.read())
41
 
            self.assertEquals(yaml.load(data), expect_cloud_init)
 
39
                expect_cloud_init = serializer.load(f.read())
 
40
            self.assertEquals(serializer.load(data), expect_cloud_init)
42
41
            return True
43
42
 
44
43
        self.ec2.run_instances(