Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id B52C0E00CF1; Tue, 29 Sep 2015 08:42:07 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [192.55.52.93 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 5E942E00CE4 for ; Tue, 29 Sep 2015 08:42:02 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 29 Sep 2015 08:41:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,608,1437462000"; d="scan'208";a="815398601" Received: from aaronmux-mobl.ger.corp.intel.com (HELO lp.ger.corp.intel.com) ([10.252.5.249]) by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2015 08:41:58 -0700 From: Elliot Smith To: toaster@yoctoproject.org Date: Tue, 29 Sep 2015 16:41:46 +0100 Message-Id: <1443541306-12019-5-git-send-email-elliot.smith@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1443541306-12019-1-git-send-email-elliot.smith@intel.com> References: <1443541306-12019-1-git-send-email-elliot.smith@intel.com> Subject: [review-request][PATCH 4/4] toaster: Fix test broken during rebase X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2015 15:42:07 -0000 The project builds page now shows latest builds as well as all builds for the project (as of d48b7ef607372488c1bf50762e4ca21773bf1e9a). This broke one of the tests during the rebase. This fixes the test to look for two instances of "bash:clean". Signed-off-by: Elliot Smith --- bitbake/lib/toaster/toastergui/tests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py index fc6bc8e..b69ac04 100644 --- a/bitbake/lib/toaster/toastergui/tests.py +++ b/bitbake/lib/toaster/toastergui/tests.py @@ -558,13 +558,19 @@ class ProjectBuildsDisplayTest(TestCase): self.assertEqual(len(build_rows), 2) def test_show_tasks_in_projectbuilds(self): + """ + Test that builds show tasks in both the project builds + and all builds areas + """ build = Build.objects.create(**self.project1_build_success) target = Target.objects.create(build=build, target='bash', task='clean') url = reverse("projectbuilds", args=(self.project1.id,)) response = self.client.get(url, follow=True) result = re.findall('^ +bash:clean$', response.content, re.MULTILINE) - self.assertEqual(len(result), 1) + self.assertEqual(len(result), + 2, + 'build should appear in latest builds and all builds') def test_show_tasks_in_allbuilds(self): build = Build.objects.create(**self.project1_build_success) -- Elliot Smith Software Engineer Intel OTC --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.