tagging 1.1.0

git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/1.1.0@1104155 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 253 deletions

diff --git a/1.1.x/test/etap/111-replication-changes-feed.t b/1.1.x/test/etap/111-replication-changes-feed.t
deleted file mode 100755
index 358bf1e2..00000000
--- a/1.1.x/test/etap/111-replication-changes-feed.t
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/usr/bin/env escript
-%% -*- erlang -*-
-
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License.  You may obtain a copy of
-% the License at
-%
-%   http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-% License for the specific language governing permissions and limitations under
-% the License.
-
-%% XXX: Figure out how to -include("couch_db.hrl")
--record(doc, {id= <<"">>, revs={0, []}, body={[]},
-            attachments=[], deleted=false, meta=[]}).
-
--record(http_db, {
-    url,
-    auth = [],
-    resource = "",
-    headers = [
-        {"User-Agent", "CouchDB/"++couch_server:get_version()},
-        {"Accept", "application/json"},
-        {"Accept-Encoding", "gzip"}
-    ],
-    qs = [],
-    method = get,
-    body = nil,
-    options = [
-        {response_format,binary},
-        {inactivity_timeout, 30000}
-    ],
-    retries = 10,
-    pause = 1,
-    conn = nil
-}).
-
-main(_) ->
-    test_util:init_code_path(),
-    
-    etap:plan(13),
-    case (catch test()) of
-        ok ->
-            etap:end_tests();
-        Other ->
-            etap:diag(io_lib:format("Test died abnormally: ~p", [Other])),
-            etap:bail(Other)
-    end,
-    ok.
-
-test() ->
-    couch_server_sup:start_link(test_util:config_files()),
-    ibrowse:start(),
-    crypto:start(),
-
-    couch_server:delete(<<"etap-test-db">>, []),
-    {ok, Db1} = couch_db:create(<<"etap-test-db">>, []),
-    test_all(local),
-    couch_db:close(Db1),
-    couch_server:delete(<<"etap-test-db">>, []),
-
-    couch_server:delete(<<"etap-test-db">>, []),
-    {ok, Db2} = couch_db:create(<<"etap-test-db">>, []),
-    test_all(remote),
-    test_remote_only(),
-    couch_db:close(Db2),
-    couch_server:delete(<<"etap-test-db">>, []),
-
-    ok.
-
-test_all(Type) ->
-    test_unchanged_db(Type),
-    test_simple_change(Type),
-    test_since_parameter(Type),
-    test_continuous_parameter(Type),
-    test_conflicts(Type),
-    test_deleted_conflicts(Type).
-
-test_remote_only() ->
-    test_chunk_reassembly(remote).
-
-test_unchanged_db(Type) ->
-    {ok, Pid} = start_changes_feed(Type, 0, false),
-    etap:is(
-        couch_rep_changes_feed:next(Pid),
-        complete,
-        io_lib:format(
-            "(~p) changes feed for unchanged DB is automatically complete",
-            [Type])
-    ).
-
-test_simple_change(Type) ->
-    Expect = generate_change(),
-    {ok, Pid} = start_changes_feed(Type, 0, false),
-    etap:is(
-        {couch_rep_changes_feed:next(Pid), couch_rep_changes_feed:next(Pid)},
-        {[Expect], complete},
-        io_lib:format("(~p) change one document, get one row", [Type])
-    ).
-
-test_since_parameter(Type) ->
-    {ok, Pid} = start_changes_feed(Type, get_update_seq(), false), 
-    etap:is(
-        couch_rep_changes_feed:next(Pid),
-        complete,
-        io_lib:format(
-            "(~p) since query-string parameter allows us to skip changes",
-            [Type])
-    ).
-
-test_continuous_parameter(Type) ->
-    {ok, Pid} = start_changes_feed(Type, get_update_seq(), true),
-
-    % make the changes_feed request before the next update
-    Self = self(),
-    spawn(fun() -> 
-        Change = couch_rep_changes_feed:next(Pid), 
-        Self ! {actual, Change}
-    end),
-
-    Expect = generate_change(),
-    etap:is(
-        receive {actual, Actual} -> Actual end,
-        [Expect],
-        io_lib:format(
-            "(~p) feed=continuous query-string parameter picks up new changes",
-            [Type])
-    ),
-
-    ok = couch_rep_changes_feed:stop(Pid).
-
-test_conflicts(Type) ->
-    Since = get_update_seq(),
-    Expect = generate_conflict(),
-    {ok, Pid} = start_changes_feed(Type, Since, false),
-    etap:is(
-        {couch_rep_changes_feed:next(Pid), couch_rep_changes_feed:next(Pid)},
-        {[Expect], complete},
-        io_lib:format("(~p) conflict revisions show up in feed", [Type])
-    ).
-
-test_deleted_conflicts(Type) ->
-    Since = get_update_seq(),
-    {ExpectProps} = generate_conflict(),
-
-    %% delete the conflict revision
-    Id = couch_util:get_value(<<"id">>, ExpectProps),
-    [Win, {[{<<"rev">>, Lose}]}] = couch_util:get_value(<<"changes">>, ExpectProps),
-    Doc = couch_doc:from_json_obj({[
-        {<<"_id">>, Id},
-        {<<"_rev">>, Lose},
-        {<<"_deleted">>, true}
-    ]}),
-    Db = get_db(),
-    {ok, Rev} = couch_db:update_doc(Db, Doc, [full_commit]),
-    couch_db:close(Db),
-
-    Expect = {[
-        {<<"seq">>, get_update_seq()},
-        {<<"id">>, Id},
-        {<<"changes">>, [Win, {[{<<"rev">>, couch_doc:rev_to_str(Rev)}]}]}
-    ]},
-    
-    {ok, Pid} = start_changes_feed(Type, Since, false),
-    etap:is(
-        {couch_rep_changes_feed:next(Pid), couch_rep_changes_feed:next(Pid)},
-        {[Expect], complete},
-        io_lib:format("(~p) deleted conflict revisions show up in feed", [Type])
-    ).
-
-test_chunk_reassembly(Type) ->
-    Since = get_update_seq(),
-    Expect = [generate_change() || _I <- lists:seq(1,30)],
-    {ok, Pid} = start_changes_feed(Type, Since, false),
-    etap:is(
-        get_all_changes(Pid, []),
-        Expect,
-        io_lib:format("(~p) reassembles chunks split across TCP frames",
-            [Type])
-    ).
-
-get_all_changes(Pid, Acc) ->
-    case couch_rep_changes_feed:next(Pid) of
-    complete ->
-        lists:flatten(lists:reverse(Acc));
-    Else ->
-        get_all_changes(Pid, [Else|Acc])
-    end.
-
-generate_change() ->
-    generate_change(couch_uuids:random()).
-
-generate_change(Id) ->
-    generate_change(Id, {[]}).
-
-generate_change(Id, EJson) ->
-    Doc = couch_doc:from_json_obj(EJson),
-    Db = get_db(),
-    {ok, Rev} = couch_db:update_doc(Db, Doc#doc{id = Id}, [full_commit]),
-    couch_db:close(Db),
-    {[
-        {<<"seq">>, get_update_seq()},
-        {<<"id">>, Id},
-        {<<"changes">>, [{[{<<"rev">>, couch_doc:rev_to_str(Rev)}]}]}
-    ]}.
-
-generate_conflict() ->
-    Id = couch_uuids:random(),
-    Db = get_db(),
-    Doc1 = (couch_doc:from_json_obj({[<<"foo">>, <<"bar">>]}))#doc{id = Id},
-    Doc2 = (couch_doc:from_json_obj({[<<"foo">>, <<"baz">>]}))#doc{id = Id},
-    {ok, Rev1} = couch_db:update_doc(Db, Doc1, [full_commit]),
-    {ok, Rev2} = couch_db:update_doc(Db, Doc2, [full_commit, all_or_nothing]),
-
-    %% relies on undocumented CouchDB conflict winner algo and revision sorting!
-    RevList = [{[{<<"rev">>, couch_doc:rev_to_str(R)}]} || R
-        <- lists:sort(fun(A,B) -> B<A end, [Rev1,Rev2])],
-    {[
-        {<<"seq">>, get_update_seq()},
-        {<<"id">>, Id},
-        {<<"changes">>, RevList}
-    ]}.
-    
-get_db() ->
-    {ok, Db} = couch_db:open(<<"etap-test-db">>, []),
-    Db.
-
-get_dbname(local) ->
-    "etap-test-db";
-get_dbname(remote) ->
-    server() ++ "etap-test-db/".
-
-server() ->
-    lists:concat([
-        "http://127.0.0.1:", mochiweb_socket_server:get(couch_httpd, port), "/"
-    ]).
-
-get_update_seq() ->
-    Db = get_db(),
-    Seq = couch_db:get_update_seq(Db),
-    couch_db:close(Db),
-    Seq.
-
-start_changes_feed(local, Since, Continuous) ->
-    Props = [{<<"continuous">>, Continuous}],
-    couch_rep_changes_feed:start_link(self(), get_db(), Since, Props);
-start_changes_feed(remote, Since, Continuous) ->
-    Props = [{<<"continuous">>, Continuous}],
-    Db = #http_db{url = get_dbname(remote)},
-    couch_rep_changes_feed:start_link(self(), Db, Since, Props).