From commits-return-10198-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Tue Mar 5 14:44:24 2013 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 B506BECAB for ; Tue, 5 Mar 2013 14:44:24 +0000 (UTC) Received: (qmail 60984 invoked by uid 500); 5 Mar 2013 14:44:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 60749 invoked by uid 500); 5 Mar 2013 14:44:20 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 60662 invoked by uid 99); 5 Mar 2013 14:44:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 14:44:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 78D89830093; Tue, 5 Mar 2013 14:44:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: fix 250*.t Message-Id: <20130305144417.78D89830093@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 14:44:17 +0000 (UTC) fix 250*.t Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e5478a86 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e5478a86 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e5478a86 Branch: refs/heads/master Commit: e5478a86cd4d1deb0ac842ca9a42677ec6685cb2 Parents: 2b8539d Author: Jan Lehnardt Authored: Tue Mar 5 14:50:46 2013 +0100 Committer: Jan Lehnardt Committed: Tue Mar 5 15:41:32 2013 +0100 ---------------------------------------------------------------------- test/etap/250-upgrade-legacy-view-files.t | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5478a86/test/etap/250-upgrade-legacy-view-files.t ---------------------------------------------------------------------- diff --git a/test/etap/250-upgrade-legacy-view-files.t b/test/etap/250-upgrade-legacy-view-files.t index 998264d..49a65a5 100644 --- a/test/etap/250-upgrade-legacy-view-files.t +++ b/test/etap/250-upgrade-legacy-view-files.t @@ -38,7 +38,7 @@ test() -> ok. fixture_path() -> - test_util:srcdir() ++ "/test/etap/fixtures". + test_util:source_file("test/etap/fixtures"). old_db() -> fixture_path() ++ "/" ++ old_db_name(). @@ -51,6 +51,7 @@ old_view() -> old_view_name() -> "3b835456c235b1827e012e25666152f3.view". + new_view_name() -> "a1c5929f912aca32f13446122cc6ce50.view". @@ -113,14 +114,16 @@ test_upgrade() -> % copy old db file into db dir DbDir = couch_config:get("couchdb", "database_dir"), DbTarget = DbDir ++ "/" ++ old_db_name(), - filelib:ensure_dir(DbTarget), - file:copy(old_db(), DbTarget), + filelib:ensure_dir(DbDir), + OldDbName = old_db(), + {ok, _} = file:copy(OldDbName, DbTarget), % copy old view file into view dir - ViewDir = couch_config:get("couchdb", "index_dir"), + ViewDir = couch_config:get("couchdb", "view_index_dir"), ViewTarget = ViewDir ++ "/.test_design/" ++ old_view_name(), filelib:ensure_dir(ViewTarget), - file:copy(old_view(), ViewTarget), + OldViewName = old_view(), + {ok, _} = file:copy(OldViewName, ViewTarget), % ensure old header ensure_header(ViewTarget, fun(#index_header{}) -> true; (_) -> false end, "old"),