Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56515111C2 for ; Thu, 17 Jul 2014 15:19:09 +0000 (UTC) Received: (qmail 58541 invoked by uid 500); 17 Jul 2014 15:19:08 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 58476 invoked by uid 500); 17 Jul 2014 15:19:08 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 58424 invoked by uid 99); 17 Jul 2014 15:19:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 15:19:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 17 Jul 2014 15:19:06 +0000 Received: (qmail 55169 invoked by uid 99); 17 Jul 2014 15:18:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 15:18:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8A68B8C0873; Thu, 17 Jul 2014 15:18:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchucarroll@apache.org To: commits@aurora.incubator.apache.org Date: Thu, 17 Jul 2014 15:18:46 -0000 Message-Id: <41e2f52bb8e845a3aef417b71a5a4e61@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Revert "Modify failing test." X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 303a84f87 -> 065c92700 Revert "Modify failing test." This reverts commit 303a84f871620b541188442a2cbe324d338af919. Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/d3add845 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/d3add845 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/d3add845 Branch: refs/heads/master Commit: d3add845e5892a803448f2c9b23531897ef225c6 Parents: 303a84f Author: Mark Chu-Carroll Authored: Thu Jul 17 11:18:23 2014 -0400 Committer: Mark Chu-Carroll Committed: Thu Jul 17 11:18:23 2014 -0400 ---------------------------------------------------------------------- src/test/python/apache/aurora/client/cli/test_diff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d3add845/src/test/python/apache/aurora/client/cli/test_diff.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/client/cli/test_diff.py b/src/test/python/apache/aurora/client/cli/test_diff.py index e69a32a..32bd3db 100644 --- a/src/test/python/apache/aurora/client/cli/test_diff.py +++ b/src/test/python/apache/aurora/client/cli/test_diff.py @@ -208,12 +208,12 @@ class TestDiffCommand(AuroraClientCommandTest): {"name": "serv", "metadata": [Metadata(key="a", value="1"), Metadata(key="b", value="2"), Metadata(key="instance", value="2")]}] - two = [{"name": "serv", "metadata": [Metadata(key="a", value="1"), - Metadata(key="b", value="2"), Metadata(key="instance", value="0")]}, - {"name": "serv", "metadata": [Metadata(key="a", value="3"), - Metadata(key="b", value="2"), Metadata(key="instance", value="1")]}, + two = [{"name": "serv", "metadata": [Metadata(key="b", value="2"), + Metadata(key="a", value="1"), Metadata(key="instance", value="0")]}, + {"name": "serv", "metadata": [Metadata(key="instance", value="1"), + Metadata(key="a", value="3"), Metadata(key="b", value="2")]}, {"name": "serv", "metadata": [Metadata(key="a", value="1"), - Metadata(key="b", value="2"), Metadata(key="instance", value="2")]}] + Metadata(key="instance", value="2"), Metadata(key="b", value="2")]}] result = self._test_successful_diff_generic(one, two) assert result == EXIT_OK