diff options
| author | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
|---|---|---|
| committer | kyleknap <kyleknap@amazon.com> | 2014-10-08 12:41:04 -0700 |
| commit | 2517f660f8ef9012708d46da3a36ab967993d2f6 (patch) | |
| tree | d90281aecdf962a2c7342938ac0a20d57fb74088 /tests/unit/ec2/test_instance.py | |
| parent | ff3d8159af3c816303785e023a4182aacb6aabf5 (diff) | |
| parent | 8f500ce75fea1ba1446195b26dddbe90b52223d8 (diff) | |
| download | boto-2.33.0.tar.gz | |
Merge branch 'release-2.33.0'2.33.0
Diffstat (limited to 'tests/unit/ec2/test_instance.py')
| -rw-r--r-- | tests/unit/ec2/test_instance.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/unit/ec2/test_instance.py b/tests/unit/ec2/test_instance.py index 910337e8..4794d4cc 100644 --- a/tests/unit/ec2/test_instance.py +++ b/tests/unit/ec2/test_instance.py @@ -5,7 +5,6 @@ from tests.compat import unittest, mock from tests.unit import AWSMockServiceTestCase from boto.ec2.connection import EC2Connection -from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping DESCRIBE_INSTANCE_VPC = br"""<?xml version="1.0" encoding="UTF-8"?> <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2012-10-01/"> @@ -224,7 +223,7 @@ class TestRunInstances(AWSMockServiceTestCase): image_id='123456', instance_type='m1.large', security_groups=['group1', 'group2'], - user_data = '#!/bin/bash' + user_data='#!/bin/bash' ) self.assert_request_parameters({ |