Fix broken tests, lint

GoogleCloudPlatform · Mar 7, 2017 · 2fa5ff2 · 2fa5ff2
1 parent b62e084
commit 2fa5ff2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/perfkitbenchmarker/providers/aws/aws_virtual_machine.py b/perfkitbenchmarker/providers/aws/aws_virtual_machine.py
@@ -297,7 +297,8 @@ def __init__(self, vm_spec):
           'In order to use dedicated hosts, you must specify an availability '
           'zone, not a region ("zone" was %s).' % self.zone)
     if self.machine_type[:2].lower() == 'i3' and not FLAGS['image'].present:
-      #TODO(user): Remove this check when pkb defaults to ubuntu-1604.
+      #if self.machine_type[:2].lower() == 'i3' and not FLAGS['image'].present:
+      # TODO(user): Remove this check when pkb defaults to ubuntu-1604.
       raise ValueError(
           'In order to use i3 instances, you must specify --image.')
 

diff --git a/tests/disk_types_renaming_test.py b/tests/disk_types_renaming_test.py
@@ -105,6 +105,7 @@ def testEBSStandard(self):
                 'cloud': 'AWS',
                 'vm_spec': {
                     'AWS': {
+                        'machine_type': 'test_machine_type',
                         'zone': 'us-east-1a'
                     }
                 },
@@ -127,6 +128,7 @@ def testEBSGP(self):
                 'cloud': 'AWS',
                 'vm_spec': {
                     'AWS': {
+                        'machine_type': 'test_machine_type',
                         'zone': 'us-east-1a'
                     }
                 },
@@ -149,6 +151,7 @@ def testEBSPIOPS(self):
                 'cloud': 'AWS',
                 'vm_spec': {
                     'AWS': {
+                        'machine_type': 'test_machine_type',
                         'zone': 'us-east-1a'
                     }
                 },

diff --git a/tests/scratch_disk_test.py b/tests/scratch_disk_test.py
@@ -179,7 +179,8 @@ def _PatchCloudSpecific(self):
 
   def _CreateVm(self):
     vm_spec = aws_virtual_machine.AwsVmSpec('test_vm_spec.AWS',
-                                            zone='us-east-1a')
+                                            zone='us-east-1a',
+                                            machine_type='test_machine_type')
     return aws_virtual_machine.DebianBasedAwsVirtualMachine(vm_spec)
 
   def _GetDiskClass(self):