From 9e130a4b78f73196e84038c241cd4e1c29a94556 Mon Sep 17 00:00:00 2001 From: "Yilei (Dolee) Yang" Date: Tue, 11 Apr 2017 14:49:07 -0400 Subject: [PATCH] Use snake_case gflags APIs. (#1328) --- .../configs/benchmark_config_spec.py | 2 +- perfkitbenchmarker/flag_util.py | 19 +++---- .../linux_benchmarks/multichase_benchmark.py | 4 +- perfkitbenchmarker/pkb.py | 2 +- perfkitbenchmarker/stages.py | 4 +- tests/background_cpu_test.py | 10 ++-- tests/background_network_workload_test.py | 16 +++--- tests/disk_test.py | 8 +-- tests/flag_util_test.py | 52 +++++++++---------- tests/gce_virtual_machine_test.py | 8 +-- .../multichase_benchmark_test.py | 8 +-- tests/mock_flags.py | 2 +- tests/mock_flags_test.py | 6 +-- tests/providers/aws/aws_disk_test.py | 4 +- tests/stages_test.py | 18 +++---- 15 files changed, 82 insertions(+), 81 deletions(-) diff --git a/perfkitbenchmarker/configs/benchmark_config_spec.py b/perfkitbenchmarker/configs/benchmark_config_spec.py index 0ffff920dc..59f1da2b57 100644 --- a/perfkitbenchmarker/configs/benchmark_config_spec.py +++ b/perfkitbenchmarker/configs/benchmark_config_spec.py @@ -71,7 +71,7 @@ def Decode(self, value, component_full_name, flag_values): self._GetOptionFullName(component_full_name), key)) if not merged_flag_values[key].present: try: - merged_flag_values[key].Parse(value) + merged_flag_values[key].parse(value) except flags.IllegalFlagValue as e: raise errors.Config.InvalidValue( 'Invalid {0}.{1} value: "{2}" (of type "{3}").{4}{5}'.format( diff --git a/perfkitbenchmarker/flag_util.py b/perfkitbenchmarker/flag_util.py index 9937604951..c9be9553c6 100644 --- a/perfkitbenchmarker/flag_util.py +++ b/perfkitbenchmarker/flag_util.py @@ -99,7 +99,7 @@ def __iter__(self): yield val def __str__(self): - return IntegerListSerializer().Serialize(self) + return IntegerListSerializer().serialize(self) def _CreateXrangeFromTuple(self, input_tuple): start = input_tuple[0] @@ -137,7 +137,7 @@ def __init__(self, on_nonincreasing=None): self.on_nonincreasing = on_nonincreasing - def Parse(self, inp): + def parse(self, inp): """Parse an integer list. Args: @@ -189,17 +189,18 @@ def HandleNonIncreasing(): return IntegerList(result) - def Type(self): + def flag_type(self): return 'integer list' class IntegerListSerializer(flags.ArgumentSerializer): + def _SerializeRange(self, val): if len(val) == 2: return '%s-%s' % (val[0], val[1]) return '%s-%s-%s' % (val[0], val[1], val[2]) - def Serialize(self, il): + def serialize(self, il): return ','.join([str(val) if isinstance(val, int) or isinstance(val, long) else self._SerializeRange(val) for val in il.groups]) @@ -263,7 +264,7 @@ def __init__(self, convertible_to): convertible_to: Either an individual unit specification or a series of unit specifications, where each unit specification is either a string (e.g. 'byte') or a units.Unit. The parser input must be convertible to - at least one of the specified Units, or the Parse() method will raise + at least one of the specified Units, or the parse() method will raise a ValueError. """ if isinstance(convertible_to, (basestring, units.Unit)): @@ -271,7 +272,7 @@ def __init__(self, convertible_to): else: self.convertible_to = [units.Unit(u) for u in convertible_to] - def Parse(self, inp): + def parse(self, inp): """Parse the input. Args: @@ -311,7 +312,7 @@ def Parse(self, inp): class UnitsSerializer(flags.ArgumentSerializer): - def Serialize(self, units): + def serialize(self, units): return str(units) @@ -409,7 +410,7 @@ class YAMLParser(flags.ArgumentParser): syntactic_help = 'A YAML expression.' - def Parse(self, inp): + def parse(self, inp): """Parse the input. Args: @@ -437,7 +438,7 @@ def Parse(self, inp): class YAMLSerializer(flags.ArgumentSerializer): - def Serialize(self, val): + def serialize(self, val): return yaml.dump(val) diff --git a/perfkitbenchmarker/linux_benchmarks/multichase_benchmark.py b/perfkitbenchmarker/linux_benchmarks/multichase_benchmark.py index 8a5fffaa15..d9b9ca6637 100644 --- a/perfkitbenchmarker/linux_benchmarks/multichase_benchmark.py +++ b/perfkitbenchmarker/linux_benchmarks/multichase_benchmark.py @@ -72,7 +72,7 @@ def __init__(self): super(_MemorySizeParser, self).__init__(convertible_to=(units.byte, units.percent)) - def Parse(self, inp): + def parse(self, inp): """Parse the input. Args: @@ -85,7 +85,7 @@ def Parse(self, inp): ValueError: If the input cannot be parsed, or if it parses to a value that does not meet the requirements described in self.syntactic_help. """ - size = super(_MemorySizeParser, self).Parse(inp) + size = super(_MemorySizeParser, self).parse(inp) if size.units != units.percent: size_byte_count = size.to(units.byte).magnitude if size_byte_count != int(size_byte_count): diff --git a/perfkitbenchmarker/pkb.py b/perfkitbenchmarker/pkb.py index 808ddfaf4e..9236e847da 100644 --- a/perfkitbenchmarker/pkb.py +++ b/perfkitbenchmarker/pkb.py @@ -585,7 +585,7 @@ def _LogCommandLineFlags(): for name in FLAGS: flag = FLAGS[name] if flag.present: - result.append(flag.Serialize()) + result.append(flag.serialize()) logging.info('Flag values:\n%s', '\n'.join(result)) diff --git a/perfkitbenchmarker/stages.py b/perfkitbenchmarker/stages.py index b6264399d0..9aca114959 100644 --- a/perfkitbenchmarker/stages.py +++ b/perfkitbenchmarker/stages.py @@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs): super(RunStageParser, self).__init__(*args, **kwargs) self.syntactic_help = _SYNTACTIC_HELP - def Parse(self, argument): + def parse(self, argument): """Parses a list of stages. Args: @@ -62,7 +62,7 @@ def Parse(self, argument): ValueError: If argument does not conform to the guidelines explained in syntactic_help. """ - stage_list = super(RunStageParser, self).Parse(argument) + stage_list = super(RunStageParser, self).parse(argument) if not stage_list: raise ValueError('Unable to parse {0}. Stage list cannot be ' diff --git a/tests/background_cpu_test.py b/tests/background_cpu_test.py index 546ed5616c..e8e96d5090 100644 --- a/tests/background_cpu_test.py +++ b/tests/background_cpu_test.py @@ -115,8 +115,8 @@ def _CheckVMFromSpec(self, spec, working_groups=(), non_working_groups=()): def testWindowsVMCausesError(self): """ windows vm with background_cpu_threads raises exception """ - self._mocked_flags['background_cpu_threads'].Parse(1) - self._mocked_flags['os_type'].Parse(os_types.WINDOWS) + self._mocked_flags['background_cpu_threads'].parse(1) + self._mocked_flags['os_type'].parse(os_types.WINDOWS) spec = self._CreateBenchmarkSpec(ping_benchmark.BENCHMARK_CONFIG) spec.ConstructVirtualMachines() with self.assertRaisesRegexp(Exception, 'NotImplementedError'): @@ -128,7 +128,7 @@ def testWindowsVMCausesError(self): def testBackgroundWorkloadVM(self): """ Check that the background_cpu_threads causes calls """ - self._mocked_flags['background_cpu_threads'].Parse(1) + self._mocked_flags['background_cpu_threads'].parse(1) spec = self._CreateBenchmarkSpec(ping_benchmark.BENCHMARK_CONFIG) spec.ConstructVirtualMachines() self._CheckVMFromSpec(spec, working_groups=(_GROUP_1, _GROUP_2)) @@ -144,7 +144,7 @@ def testBackgroundWorkloadVanillaConfig(self): def testBackgroundWorkloadWindows(self): """ Test that nothing happens with the vanilla config """ - self._mocked_flags['os_type'].Parse(os_types.WINDOWS) + self._mocked_flags['os_type'].parse(os_types.WINDOWS) spec = self._CreateBenchmarkSpec(ping_benchmark.BENCHMARK_CONFIG) spec.ConstructVirtualMachines() for vm in spec.vms: @@ -154,7 +154,7 @@ def testBackgroundWorkloadWindows(self): def testBackgroundWorkloadVanillaConfigFlag(self): """ Check that the background_cpu_threads flags overrides the config """ - self._mocked_flags['background_cpu_threads'].Parse(2) + self._mocked_flags['background_cpu_threads'].parse(2) spec = self._CreateBenchmarkSpec(ping_benchmark.BENCHMARK_CONFIG) spec.ConstructVirtualMachines() for vm in spec.vms: diff --git a/tests/background_network_workload_test.py b/tests/background_network_workload_test.py index 22d660f9ca..d34b816595 100644 --- a/tests/background_network_workload_test.py +++ b/tests/background_network_workload_test.py @@ -153,8 +153,8 @@ def makeSpec(self, yaml_benchmark_config=ping_benchmark.BENCHMARK_CONFIG): def testWindowsVMCausesError(self): """ windows vm with background_network_mbits_per_sec raises exception """ - self.mocked_flags['background_network_mbits_per_sec'].Parse(200) - self.mocked_flags['os_type'].Parse(os_types.WINDOWS) + self.mocked_flags['background_network_mbits_per_sec'].parse(200) + self.mocked_flags['os_type'].parse(os_types.WINDOWS) spec = self.makeSpec() with self.assertRaisesRegexp(Exception, 'NotImplementedError'): spec.Prepare() @@ -165,7 +165,7 @@ def testWindowsVMCausesError(self): def testBackgroundWorkloadVM(self): """ Check that the vm background workload calls work """ - self.mocked_flags['background_network_mbits_per_sec'].Parse(200) + self.mocked_flags['background_network_mbits_per_sec'].parse(200) spec = self.makeSpec() self._CheckVMFromSpec(spec, working_groups=(_GROUP_1, _GROUP_2)) @@ -189,7 +189,7 @@ def testBackgroundWorkloadWindows(self): def testBackgroundWorkloadVanillaConfigFlag(self): """ Check that the flag overrides the config """ - self.mocked_flags['background_network_mbits_per_sec'].Parse(200) + self.mocked_flags['background_network_mbits_per_sec'].parse(200) spec = self.makeSpec() for vm in spec.vms: self.assertEqual(vm.background_network_mbits_per_sec, 200) @@ -198,8 +198,8 @@ def testBackgroundWorkloadVanillaConfigFlag(self): def testBackgroundWorkloadVanillaConfigFlagIpType(self): """ Check that the flag overrides the config """ - self.mocked_flags['background_network_mbits_per_sec'].Parse(200) - self.mocked_flags['background_network_ip_type'].Parse('INTERNAL') + self.mocked_flags['background_network_mbits_per_sec'].parse(200) + self.mocked_flags['background_network_ip_type'].parse('INTERNAL') spec = self.makeSpec() for vm in spec.vms: self.assertEqual(vm.background_network_mbits_per_sec, 200) @@ -208,8 +208,8 @@ def testBackgroundWorkloadVanillaConfigFlagIpType(self): def testBackgroundWorkloadVanillaConfigBadIpTypeFlag(self): """ Check that the flag overrides the config """ - self.mocked_flags['background_network_mbits_per_sec'].Parse(200) - self.mocked_flags['background_network_ip_type'].Parse('IAMABADFLAGVALUE') + self.mocked_flags['background_network_mbits_per_sec'].parse(200) + self.mocked_flags['background_network_ip_type'].parse('IAMABADFLAGVALUE') config = configs.LoadConfig(ping_benchmark.BENCHMARK_CONFIG, {}, NAME) with self.assertRaises(errors.Config.InvalidValue): benchmark_config_spec.BenchmarkConfigSpec( diff --git a/tests/disk_test.py b/tests/disk_test.py index c8ca7cf1ad..0b40a761c0 100644 --- a/tests/disk_test.py +++ b/tests/disk_test.py @@ -101,10 +101,10 @@ def testNonPresentFlagsDoNotOverrideConfigs(self): def testPresentFlagsOverrideConfigs(self): flags = mock_flags.MockFlags() - flags['data_disk_size'].Parse(100) - flags['data_disk_type'].Parse('flag_disk_type') - flags['num_striped_disks'].Parse(3) - flags['scratch_dir'].Parse('/flag_scratch_dir') + flags['data_disk_size'].parse(100) + flags['data_disk_type'].parse('flag_disk_type') + flags['num_striped_disks'].parse(3) + flags['scratch_dir'].parse('/flag_scratch_dir') spec = disk.BaseDiskSpec( _COMPONENT, flags, device_path='config_device_path', disk_number=1, disk_size=75, disk_type='config_disk_type', mount_point='/mountpoint', diff --git a/tests/flag_util_test.py b/tests/flag_util_test.py index 200bf9cc16..0a0868d4ba 100644 --- a/tests/flag_util_test.py +++ b/tests/flag_util_test.py @@ -74,16 +74,16 @@ def setUp(self): self.ilp = flag_util.IntegerListParser() def testOneInteger(self): - self.assertEqual(list(self.ilp.Parse('3')), [3]) + self.assertEqual(list(self.ilp.parse('3')), [3]) def testIntegerRange(self): - self.assertEqual(list(self.ilp.Parse('3-5')), [3, 4, 5]) + self.assertEqual(list(self.ilp.parse('3-5')), [3, 4, 5]) def testIntegerRangeWithStep(self): self.assertEqual(list(self.ilp.Parse('2-7-2')), [2, 4, 6]) def testIntegerList(self): - self.assertEqual(list(self.ilp.Parse('3-5,8,10-12')), + self.assertEqual(list(self.ilp.parse('3-5,8,10-12')), [3, 4, 5, 8, 10, 11, 12]) def testIntegerListWithRangeAndStep(self): @@ -92,31 +92,31 @@ def testIntegerListWithRangeAndStep(self): def testNoInteger(self): with self.assertRaises(ValueError): - self.ilp.Parse('a') + self.ilp.parse('a') def testBadRange(self): with self.assertRaises(ValueError): - self.ilp.Parse('3-a') + self.ilp.parse('3-a') def testBadList(self): with self.assertRaises(ValueError): - self.ilp.Parse('3-5,8a') + self.ilp.parse('3-5,8a') def testTrailingComma(self): with self.assertRaises(ValueError): - self.ilp.Parse('3-5,') + self.ilp.parse('3-5,') def testNonIncreasingEntries(self): ilp = flag_util.IntegerListParser( on_nonincreasing=flag_util.IntegerListParser.EXCEPTION) with self.assertRaises(ValueError): - ilp.Parse('3,2,1') + ilp.parse('3,2,1') def testNonIncreasingRange(self): ilp = flag_util.IntegerListParser( on_nonincreasing=flag_util.IntegerListParser.EXCEPTION) with self.assertRaises(ValueError): - ilp.Parse('3-1') + ilp.parse('3-1') def testNonIncreasingRangeWithStep(self): ilp = flag_util.IntegerListParser( @@ -130,7 +130,7 @@ def testSerialize(self): ser = flag_util.IntegerListSerializer() il = flag_util.IntegerList([1, (2, 5), 9]) - self.assertEqual(ser.Serialize(il), + self.assertEqual(ser.serialize(il), '1,2-5,9') def testSerializeWithStep(self): @@ -180,50 +180,50 @@ def setUp(self): self.up = flag_util.UnitsParser('byte') def testParser(self): - self.assertEqual(self.up.Parse('10KiB'), 10 * 1024 * units.byte) + self.assertEqual(self.up.parse('10KiB'), 10 * 1024 * units.byte) def testQuantity(self): quantity = 1.0 * units.byte - self.assertEqual(self.up.Parse(quantity), quantity) + self.assertEqual(self.up.parse(quantity), quantity) def testBadExpression(self): with self.assertRaises(ValueError): - self.up.Parse('asdf') + self.up.parse('asdf') def testUnitlessExpression(self): with self.assertRaises(ValueError): - self.up.Parse('10') + self.up.parse('10') def testBytes(self): - q = self.up.Parse('1B') + q = self.up.parse('1B') self.assertEqual(q.magnitude, 1.0) self.assertEqual(q.units, {'byte': 1.0}) def testBytesWithPrefix(self): - q = self.up.Parse('2KB').to(units.byte) + q = self.up.parse('2KB').to(units.byte) self.assertEqual(q.magnitude, 2000.0) self.assertEqual(q.units, {'byte': 1.0}) def testWrongUnit(self): with self.assertRaises(ValueError): - self.up.Parse('1m') + self.up.parse('1m') def testConvertibleToUnit(self): up = flag_util.UnitsParser(convertible_to=units.byte) - self.assertEqual(up.Parse('10KiB'), 10 * 1024 * units.byte) + self.assertEqual(up.parse('10KiB'), 10 * 1024 * units.byte) def testConvertibleToSeries(self): up = flag_util.UnitsParser(convertible_to=(units.byte, 'second')) - self.assertEqual(up.Parse('10 MB'), 10 * units.Unit('megabyte')) - self.assertEqual(up.Parse('10 minutes'), 10 * units.Unit('minute')) + self.assertEqual(up.parse('10 MB'), 10 * units.Unit('megabyte')) + self.assertEqual(up.parse('10 minutes'), 10 * units.Unit('minute')) with self.assertRaises(ValueError): - up.Parse('1 meter') + up.parse('1 meter') def testPercent(self): up = flag_util.UnitsParser(convertible_to=units.percent) - self.assertEqual(up.Parse('100%'), 100 * units.percent) + self.assertEqual(up.parse('100%'), 100 * units.percent) with self.assertRaises(ValueError): - up.Parse('10KiB') + up.parse('10KiB') class TestStringToBytes(unittest.TestCase): @@ -280,16 +280,16 @@ def setUp(self): self.parser = flag_util.YAMLParser() def testValidString(self): - self.assertEqual(self.parser.Parse('[1, 2, 3]'), + self.assertEqual(self.parser.parse('[1, 2, 3]'), [1, 2, 3]) def testPreParsedYAML(self): - self.assertEqual(self.parser.Parse([1, 2, 3]), + self.assertEqual(self.parser.parse([1, 2, 3]), [1, 2, 3]) def testBadYAML(self): with self.assertRaises(ValueError): - self.parser.Parse('{a') + self.parser.parse('{a') if __name__ == '__main__': diff --git a/tests/gce_virtual_machine_test.py b/tests/gce_virtual_machine_test.py index 00ba255ae5..5fdf954f9a 100644 --- a/tests/gce_virtual_machine_test.py +++ b/tests/gce_virtual_machine_test.py @@ -162,7 +162,7 @@ def testCustomMachineType(self): def testStringMachineTypeFlagOverride(self): flags = mock_flags.MockFlags() - flags['machine_type'].Parse('n1-standard-8') + flags['machine_type'].parse('n1-standard-8') result = gce_virtual_machine.GceVmSpec( _COMPONENT, flag_values=flags, machine_type={'cpus': 1, 'memory': '7.5GiB'}) @@ -172,7 +172,7 @@ def testStringMachineTypeFlagOverride(self): def testCustomMachineTypeFlagOverride(self): flags = mock_flags.MockFlags() - flags['machine_type'].Parse('{cpus: 1, memory: 7.5GiB}') + flags['machine_type'].parse('{cpus: 1, memory: 7.5GiB}') result = gce_virtual_machine.GceVmSpec( _COMPONENT, flag_values=flags, machine_type='n1-standard-8') self.assertEqual(result.machine_type, None) @@ -259,7 +259,7 @@ def _PatchCriticalObjects(self): def testPreemptibleVMFlag(self): with self._PatchCriticalObjects() as issue_command: - self._mocked_flags['gce_preemptible_vms'].Parse(True) + self._mocked_flags['gce_preemptible_vms'].parse(True) vm_spec = gce_virtual_machine.GceVmSpec( 'test_vm_spec.GCP', self._mocked_flags, image='image', machine_type='test_machine_type') @@ -271,7 +271,7 @@ def testPreemptibleVMFlag(self): def testImageProjectFlag(self): """Tests that custom image_project flag is supported.""" with self._PatchCriticalObjects() as issue_command: - self._mocked_flags['image_project'].Parse('bar') + self._mocked_flags['image_project'].parse('bar') vm_spec = gce_virtual_machine.GceVmSpec( 'test_vm_spec.GCP', self._mocked_flags, image='image', machine_type='test_machine_type') diff --git a/tests/linux_benchmarks/multichase_benchmark_test.py b/tests/linux_benchmarks/multichase_benchmark_test.py index d3092ac946..4e96171189 100644 --- a/tests/linux_benchmarks/multichase_benchmark_test.py +++ b/tests/linux_benchmarks/multichase_benchmark_test.py @@ -28,19 +28,19 @@ def setUp(self): def testParseNoUnits(self): with self.assertRaises(ValueError): - self._parser.Parse('10') + self._parser.parse('10') def testParseInvalidUnits(self): with self.assertRaises(ValueError): - self._parser.Parse('20 seconds') + self._parser.parse('20 seconds') def testParseExplicitMemory(self): - q = self._parser.Parse('30 GiB') + q = self._parser.parse('30 GiB') self.assertEqual(q.magnitude, 30) self.assertEqual(q.units, units.Unit('gibibyte')) def testParsePercent(self): - q = self._parser.Parse('40%') + q = self._parser.parse('40%') self.assertEqual(q.magnitude, 40) self.assertEqual(q.units, units.percent) diff --git a/tests/mock_flags.py b/tests/mock_flags.py index 12b450f851..5e24028b9f 100644 --- a/tests/mock_flags.py +++ b/tests/mock_flags.py @@ -44,7 +44,7 @@ def __init__(self): self.validators = () self.value = None - def Parse(self, argument): + def parse(self, argument): self.present = True self.value = argument diff --git a/tests/mock_flags_test.py b/tests/mock_flags_test.py index bff6c9cdd3..cd41f33e0e 100644 --- a/tests/mock_flags_test.py +++ b/tests/mock_flags_test.py @@ -51,13 +51,13 @@ def testSetViaItemAttribute(self): self.assertEqual(self.flags['test_flag'].value, 5) def testSetViaParse(self): - self.flags['test_flag'].Parse(5) + self.flags['test_flag'].parse(5) self.assertTrue(self.flags['test_flag'].present) self.assertEqual(self.flags['test_flag'].value, 5) def testCopy(self): copied_flags = copy.deepcopy(self.flags) - copied_flags['test_flag'].Parse(5) + copied_flags['test_flag'].parse(5) self.assertFalse(self.flags['test_flag'].present) self.assertIsNone(self.flags['test_flag'].value) self.assertTrue(copied_flags['test_flag'].present) @@ -71,7 +71,7 @@ def setUp(self): self.flags = mock_flags.MockFlags() def testGetFlag(self): - self.flags['test_flag'].Parse(5) + self.flags['test_flag'].parse(5) with mock_flags.PatchFlags(self.flags): self.assertEqual(FLAGS.test_flag, 5) self.assertTrue(FLAGS['test_flag'].present) diff --git a/tests/providers/aws/aws_disk_test.py b/tests/providers/aws/aws_disk_test.py index 21f5e56ac1..9a1a1a7bad 100644 --- a/tests/providers/aws/aws_disk_test.py +++ b/tests/providers/aws/aws_disk_test.py @@ -66,8 +66,8 @@ def testNonPresentFlagsDoNotOverrideConfigs(self): def testPresentFlagsOverrideConfigs(self): flags = mock_flags.MockFlags() - flags['aws_provisioned_iops'].Parse(2000) - flags['data_disk_size'].Parse(100) + flags['aws_provisioned_iops'].parse(2000) + flags['data_disk_size'].parse(100) spec = aws_disk.AwsDiskSpec(_COMPONENT, flags, disk_size=75, iops=1000) self.assertEqual(spec.disk_size, 100) self.assertEqual(spec.iops, 2000) diff --git a/tests/stages_test.py b/tests/stages_test.py index d0e1ce51ae..feddc3ba8a 100644 --- a/tests/stages_test.py +++ b/tests/stages_test.py @@ -25,34 +25,34 @@ def setUp(self): def testEmpty(self): with self.assertRaises(ValueError): - self._parser.Parse('') + self._parser.parse('') def testInvalidItem(self): with self.assertRaises(ValueError): - self._parser.Parse('provision,fake_stage') + self._parser.parse('provision,fake_stage') def testAllAndIndividualStages(self): with self.assertRaises(ValueError): - self._parser.Parse('provision,all') + self._parser.parse('provision,all') def testIncorrectOrder(self): with self.assertRaises(ValueError): - self._parser.Parse('provision,run') + self._parser.parse('provision,run') with self.assertRaises(ValueError): - self._parser.Parse('teardown,provision') + self._parser.parse('teardown,provision') def testAll(self): - self.assertEqual(self._parser.Parse('all'), + self.assertEqual(self._parser.parse('all'), ['provision', 'prepare', 'run', 'cleanup', 'teardown']) def testIndividual(self): - self.assertEqual(self._parser.Parse('prepare'), ['prepare']) + self.assertEqual(self._parser.parse('prepare'), ['prepare']) def testMultiple(self): - self.assertEqual(self._parser.Parse('prepare,run'), ['prepare', 'run']) + self.assertEqual(self._parser.parse('prepare,run'), ['prepare', 'run']) def testList(self): - self.assertEqual(self._parser.Parse(['prepare', 'run']), ['prepare', 'run']) + self.assertEqual(self._parser.parse(['prepare', 'run']), ['prepare', 'run']) if __name__ == '__main__':