Fix the resolution error from default config settings.
Bug: 178852682
Test: acloud-dev create --branch git_master --build-target cf_x86_auto-userdebug
Change-Id: I22fb52578e9756f59a5124947becdc664fb6fe11
diff --git a/public/config.py b/public/config.py
index 85d7d43..02ab4f0 100755
--- a/public/config.py
+++ b/public/config.py
@@ -269,9 +269,6 @@
parsed_args.service_account_json_private_key_path)
if parsed_args.which == "create_gf" and parsed_args.base_image:
self.stable_goldfish_host_image_name = parsed_args.base_image
- if parsed_args.which == create_args.CMD_CREATE and not self.hw_property:
- flavor = parsed_args.flavor or constants.FLAVOR_PHONE
- self.hw_property = self.common_hw_property_map.get(flavor, "")
if parsed_args.which in [create_args.CMD_CREATE, "create_cf"]:
if parsed_args.network:
self.network = parsed_args.network
diff --git a/public/config_test.py b/public/config_test.py
index cbe7a4b..be57870 100644
--- a/public/config_test.py
+++ b/public/config_test.py
@@ -276,25 +276,8 @@
config.AcloudConfigManager.LoadConfigFromProtocolBuffer(
self.config_file, internal_config_pb2.InternalConfig)
- def testOverrideWithHWProperty(self):
- """Test override hw property by flavor type."""
- # test override with an exist flavor.
- self.cfg.hw_property = None
- args = mock.MagicMock()
- args.flavor = "phone"
- args.which = "create"
- self.cfg.OverrideWithArgs(args)
- self.assertEqual(self.cfg.hw_property,
- "cpu:2,resolution:1080x1920,dpi:420,memory:4g,disk:8g")
-
- # test override with a nonexistent flavor.
- self.cfg.hw_property = None
- args = mock.MagicMock()
- args.flavor = "non-exist-flavor"
- args.which = "create"
- self.cfg.OverrideWithArgs(args)
- self.assertEqual(self.cfg.hw_property, "")
-
+ def testOverrideWithArgs(self):
+ """Test OverrideWithArgs."""
# test override zone.
self.cfg.zone = "us-central1-f"
args = mock.MagicMock()