Skip to content

Commit

Permalink
tagging 0.9.1
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/0.9.1@794853 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Noah Slater committed Jul 16, 2009
2 parents 111e428 + 0308efb commit 6c9ef18
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 9 deletions.
1 change: 1 addition & 0 deletions share/Makefile.am
Expand Up @@ -87,6 +87,7 @@ nobase_dist_localdata_DATA = \
www/script/test/large_docs.js \
www/script/test/utf8.js \
www/script/test/attachments.js \
www/script/test/attachment_names.js \
www/script/test/attachment_paths.js \
www/script/test/attachment_views.js \
www/script/test/design_paths.js \
Expand Down
14 changes: 14 additions & 0 deletions share/www/_sidebar.html
@@ -1,3 +1,17 @@
<!--
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.
-->
<div id="sidebar">
<a href="index.html">
<img id="logo" src="image/logo.png" width="175" height="150" alt="Apache CouchDB: Relax">
Expand Down
4 changes: 2 additions & 2 deletions share/www/script/jquery.couch.js
Expand Up @@ -239,9 +239,9 @@
dataType: "json", data: toJSON(doc),
complete: function(req) {
var resp = $.httpData(req, "json")
doc._id = resp.id;
doc._rev = resp.rev;
if (req.status == 201) {
doc._id = resp.id;
doc._rev = resp.rev;
if (options.success) options.success(resp);
} else if (options.error) {
options.error(req.status, resp.error, resp.reason);
Expand Down
20 changes: 16 additions & 4 deletions test/couch_config_test.erl
@@ -1,7 +1,19 @@
% 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.

% couch_config module test suote

% Set up test suite
% ?MODULE_test() returns a list of functions
% ?MODULE_test() returns a list of functions
% that run the actual tests.
couch_config_test() ->
[
Expand All @@ -10,7 +22,7 @@ couch_config_test() ->


% test functions

store_strings() ->
Filename = "test.ini",
file:write_file(Filename, ""),
Expand All @@ -26,8 +38,8 @@ store_strings() ->

exit(Proc, kill),
receive {'EXIT', Proc, _} -> ok end,

% clean up
file:delete(Filename),

Value = Result.
Value = Result.
18 changes: 15 additions & 3 deletions test/couch_config_writer_test.erl
@@ -1,7 +1,19 @@
% 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.

% couch_config_writer module test suote

% Set up test suite
% ?MODULE_test() returns a list of functions
% ?MODULE_test() returns a list of functions
% that run the actual tests.
% todo, fix replace_existing_variable2 (i.e. reordering)
couch_config_writer_test() ->
Expand Down Expand Up @@ -186,12 +198,12 @@ run_operation_and_compare_results(Contents, Expect, Config) ->

% call replace function
[couch_config_writer:save_to_file(ConfigVar, Filename) || ConfigVar <- Config],

% compare new file with expected file
{ok, Result_} = file:read_file(Filename),
Result = binary_to_list(Result_),

% clean up
% file:delete(Filename),

Result = Expect.
12 changes: 12 additions & 0 deletions test/runner.erl
@@ -1,3 +1,15 @@
% 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.

-module(runner).

-export([run/0]).
Expand Down
12 changes: 12 additions & 0 deletions test/runner.sh
@@ -1,5 +1,17 @@
#!/bin/sh -e

# 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.

erlc runner.erl

erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()"
Expand Down

0 comments on commit 6c9ef18

Please sign in to comment.