Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5CB931000D for ; Mon, 17 Jun 2013 04:35:52 +0000 (UTC) Received: (qmail 72155 invoked by uid 500); 17 Jun 2013 04:35:51 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71420 invoked by uid 500); 17 Jun 2013 04:35:43 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71043 invoked by uid 99); 17 Jun 2013 04:35:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jun 2013 04:35:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A260A8A5790; Mon, 17 Jun 2013 04:35:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Mon, 17 Jun 2013 04:35:39 -0000 Message-Id: <71ff6629d2af4ce09b8c5f3085ad5959@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to e405703 CLOUDSTACK-3020: Fix assert error If you do not give a name during vm creation, UUID will be set for Name and Display name will be blank. Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf0265d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf0265d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf0265d2 Branch: refs/heads/master Commit: bf0265d21d77dbc28bc61f46c535ca75b727d115 Parents: ae27d66 Author: rayeesn Authored: Sat Jun 15 10:26:13 2013 -0700 Committer: Prasanna Santhanam Committed: Mon Jun 17 10:05:02 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_custom_hostname.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf0265d2/test/integration/component/test_custom_hostname.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py index c9db215..e569215 100644 --- a/test/integration/component/test_custom_hostname.py +++ b/test/integration/component/test_custom_hostname.py @@ -300,7 +300,7 @@ class TestInstanceNameFlagTrue(cloudstackTestCase): "Running", "Vm state should be running after deployment" ) - self.assertEqual( + self.assertNotEqual( vm.displayname, vm.id, "Vm display name should not match the given name"