From patchwork Tue Sep 25 07:42:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 11704 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8D9EB23EFD for ; Tue, 25 Sep 2012 07:42:14 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3A01BA18790 for ; Tue, 25 Sep 2012 07:42:14 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so12149050iej.11 for ; Tue, 25 Sep 2012 00:42:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=lx/lhfEw4ZRt57OxN0G2vOMCV1kuG5wluQ0RsEr1hBg=; b=V70KiyGLsQTSTSn0r36uXmW8v7YwYAbo2YXlHTKT/Wu5lqX92F+at3LO4SDKsNKsvk kAlT4nXcSYXQA5XX4KRiGPMMq9GSDgEVlAh/PyPszFjeD1TWkE9MunZlXJK9U814/JWI FZq7IdjwyW3OX8U2kWKJ6qRH7m/nR/OyetIw9gYziLC3TZ21Hk+Q8zmvjjNVfO1Hszki oTJJUa8j08MbmdqmTthuc2MibnA3hOgl0usjOM893PAxzs8Rd/He2aRlRxlaHVF3yjFs +BYoPHHdEnt3fxLXtW0Jg/ra8Y07natiOc1z+jNLB4d4wsXLo5tp35YHA4+7htEnNNuv 2wFA== Received: by 10.50.154.227 with SMTP id vr3mr7410662igb.43.1348558933958; Tue, 25 Sep 2012 00:42:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp280582igc; Tue, 25 Sep 2012 00:42:13 -0700 (PDT) Received: by 10.216.24.140 with SMTP id x12mr9360560wex.101.1348558932268; Tue, 25 Sep 2012 00:42:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y61si6063286weo.15.2012.09.25.00.42.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Sep 2012 00:42:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1TGPmV-0006rk-Cw for ; Tue, 25 Sep 2012 07:42:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 51F75E042E for ; Tue, 25 Sep 2012 07:42:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 565 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 565: Merged fixes for bug 1054422. Message-Id: <20120925074211.19406.14910.launchpad@ackee.canonical.com> Date: Tue, 25 Sep 2012 07:42:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16019"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c48ad92df1912568a05e98c0e9215b5c11e86788 X-Gm-Message-State: ALoCoQnuGbikWox5YZw6G38kTU0SzQe3KVits3gYgQsIoFAyVT8aH0VF/K/nFnN9B+TnDO5h1Gfn Merge authors: Milo Casagrande (milo) ------------------------------------------------------------ revno: 565 [merge] committer: Milo Casagrande branch nick: trunk timestamp: Tue 2012-09-25 09:41:02 +0200 message: Merged fixes for bug 1054422. modified: linaro_image_tools/hwpack/hwpack_fields.py linaro_image_tools/hwpack/tests/test_config_v3.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/hwpack/hwpack_fields.py' --- linaro_image_tools/hwpack/hwpack_fields.py 2012-08-28 06:02:43 +0000 +++ linaro_image_tools/hwpack/hwpack_fields.py 2012-09-24 09:07:37 +0000 @@ -129,7 +129,7 @@ ROOT_MIN_SIZE_FIELD: None, LOADER_MIN_SIZE_FIELD: None, SAMSUNG_BL1_LEN_FIELD: None, - SAMSUNG_BL1_LEN_FIELD: None, + SAMSUNG_BL1_START_FIELD: None, SAMSUNG_ENV_LEN_FIELD: None, SAMSUNG_BL2_LEN_FIELD: None, SNOWBALL_STARTUP_FILES_CONFIG_FIELD: None, === modified file 'linaro_image_tools/hwpack/tests/test_config_v3.py' --- linaro_image_tools/hwpack/tests/test_config_v3.py 2012-08-28 17:34:16 +0000 +++ linaro_image_tools/hwpack/tests/test_config_v3.py 2012-09-24 11:29:40 +0000 @@ -26,6 +26,10 @@ from linaro_image_tools.hwpack.config import Config, HwpackConfigError from linaro_image_tools.hwpack.hwpack_fields import ( DEFINED_PARTITION_LAYOUTS, + SAMSUNG_BL1_LEN_FIELD, + SAMSUNG_BL1_START_FIELD, + SAMSUNG_BL2_LEN_FIELD, + SAMSUNG_ENV_LEN_FIELD, ) @@ -796,3 +800,28 @@ self.assertValidationError("Unknown key in metadata: " "'boards: snowball: foo'", config._validate_keys) + + def test_valid_samsung_bl1_len_field(self): + config = self.get_config(self.valid_start_v3 + + SAMSUNG_BL1_LEN_FIELD + ': 1\n') + self.assertEqual(None, config._validate_keys()) + + def test_valid_samsung_bl1_start_field(self): + config = self.get_config(self.valid_start_v3 + + SAMSUNG_BL1_START_FIELD + ': 1\n') + self.assertEqual(None, config._validate_keys()) + + def test_valid_samsung_bl2_len_field(self): + config = self.get_config(self.valid_start_v3 + + SAMSUNG_BL2_LEN_FIELD + ': 1\n') + self.assertEqual(None, config._validate_keys()) + + def test_valid_samsung_env_len_field(self): + config = self.get_config(self.valid_start_v3 + + SAMSUNG_ENV_LEN_FIELD + ': 1\n') + self.assertEqual(None, config._validate_keys()) + + def test_samsung_field_wrong(self): + config = self.get_config(self.valid_start_v3 + + 'samsung_wrong_field: 1\n') + self.assertRaises(HwpackConfigError, config._validate_keys)