diff options
author | Paul Joseph Davis <davisp@apache.org> | 2009-06-25 04:57:42 +0000 |
---|---|---|
committer | Paul Joseph Davis <davisp@apache.org> | 2009-06-25 04:57:42 +0000 |
commit | a85d922d4078b5a54c391759e79e9da6b0fb316f (patch) | |
tree | 2d77f5451c7d89ec01dd71f0dc628a8358887689 | |
parent | 25d76bffa027c3d736791949c3b1355709b9531c (diff) |
Cleaning out tabs from source code. Purely whitespace diff.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@788258 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | src/couchdb/couch_config.erl | 4 | ||||
-rw-r--r-- | src/couchdb/couch_task_status.erl | 8 | ||||
-rwxr-xr-x | test/etap/070-couch-db.t | 4 | ||||
-rwxr-xr-x | test/etap/080-config-get-set.t | 40 | ||||
-rwxr-xr-x | test/etap/081-config-override.t | 6 | ||||
-rwxr-xr-x | test/etap/082-config-register.t | 2 | ||||
-rwxr-xr-x | test/etap/083-config-no-files.t | 2 | ||||
-rwxr-xr-x | test/etap/090-task-status.t | 76 |
8 files changed, 71 insertions, 71 deletions
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl index 9a2e739a..3270b3fd 100644 --- a/src/couchdb/couch_config.erl +++ b/src/couchdb/couch_config.erl @@ -194,9 +194,9 @@ parse_ini_file(IniFile) -> {ok, [ValueName|LineValues]} -> % yeehaw, got a line! RemainingLine = couch_util:implode(LineValues, "="), {ok, [LineValue | _Rest]} = - regexp:split(RemainingLine, " ;|\t;"), % removes comments + regexp:split(RemainingLine, " ;|\t;"), % removes comments {AccSectionName, - [{{AccSectionName, ValueName}, LineValue} | AccValues]} + [{{AccSectionName, ValueName}, LineValue} | AccValues]} end end end, {"", []}, Lines), diff --git a/src/couchdb/couch_task_status.erl b/src/couchdb/couch_task_status.erl index 1e481c7c..ff2c7bee 100644 --- a/src/couchdb/couch_task_status.erl +++ b/src/couchdb/couch_task_status.erl @@ -95,12 +95,12 @@ handle_call(all, _, Server) -> All = [ [ {type, Type}, - {task, Task}, - {status, Status}, - {pid, ?l2b(pid_to_list(Pid))} + {task, Task}, + {status, Status}, + {pid, ?l2b(pid_to_list(Pid))} ] || - {Pid, {Type, Task, Status}} <- ets:tab2list(?MODULE) + {Pid, {Type, Task, Status}} <- ets:tab2list(?MODULE) ], {reply, All, Server}. diff --git a/test/etap/070-couch-db.t b/test/etap/070-couch-db.t index da1f28ab..76519a55 100755 --- a/test/etap/070-couch-db.t +++ b/test/etap/070-couch-db.t @@ -38,8 +38,8 @@ test() -> true -> couch_server:delete(MkDbName(Int), []); _ -> ok end, - {ok, Db} = couch_db:create(MkDbName(Int), []), - ok = couch_db:close(Db) + {ok, Db} = couch_db:create(MkDbName(Int), []), + ok = couch_db:close(Db) end, lists:seq(1, 200)), {ok, AllDbs3} = couch_server:all_databases(), diff --git a/test/etap/080-config-get-set.t b/test/etap/080-config-get-set.t index 4824b2aa..8cd6a9e6 100755 --- a/test/etap/080-config-get-set.t +++ b/test/etap/080-config-get-set.t @@ -27,38 +27,38 @@ test() -> etap:fun_is( fun(List) -> length(List) > 0 end, couch_config:all(), - "Data was loaded from the INI file." - ), + "Data was loaded from the INI file." + ), etap:fun_is( fun(List) -> length(List) > 0 end, couch_config:get("daemons"), - "There are settings in the [daemons] section of the INI file." - ), - + "There are settings in the [daemons] section of the INI file." + ), + etap:is( couch_config:get("httpd_design_handlers", "_view"), - "{couch_httpd_view, handle_view_req}", - "The {httpd_design_handlers, view} is the expected default." - ), + "{couch_httpd_view, handle_view_req}", + "The {httpd_design_handlers, view} is the expected default." + ), etap:is( couch_config:get("httpd", "foo", "bar"), "bar", - "Returns the default when key doesn't exist in config." - ), - - etap:is( - couch_config:get("httpd", "foo"), - undefined, - "The default default is the atom 'undefined'." - ), + "Returns the default when key doesn't exist in config." + ), + + etap:is( + couch_config:get("httpd", "foo"), + undefined, + "The default default is the atom 'undefined'." + ), etap:is( couch_config:get("httpd", "port", "bar"), "5984", - "Only returns the default when the config setting does not exist." - ), + "Only returns the default when the config setting does not exist." + ), % Check that setting values works. @@ -69,8 +69,8 @@ test() -> etap:is( couch_config:get("log", "level"), "severe", - "Non persisted changes take effect." - ), + "Non persisted changes take effect." + ), etap:is( couch_config:get("new_section", "bizzle"), diff --git a/test/etap/081-config-override.t b/test/etap/081-config-override.t index 1d66b58e..bf9655f1 100755 --- a/test/etap/081-config-override.t +++ b/test/etap/081-config-override.t @@ -48,9 +48,9 @@ test() -> etap:is( couch_config:get("couchdb", "max_dbs_open"), "100", - "{couchdb, max_dbs_open} is 100 by defualt." - ), - + "{couchdb, max_dbs_open} is 100 by defualt." + ), + etap:is( couch_config:get("httpd","port"), "5984", diff --git a/test/etap/082-config-register.t b/test/etap/082-config-register.t index 9f454984..b64e2d9c 100755 --- a/test/etap/082-config-register.t +++ b/test/etap/082-config-register.t @@ -72,4 +72,4 @@ test() -> "Implicitly test that the function got de-registered" ), - ok.
\ No newline at end of file + ok. diff --git a/test/etap/083-config-no-files.t b/test/etap/083-config-no-files.t index 2e4d8e71..28931d85 100755 --- a/test/etap/083-config-no-files.t +++ b/test/etap/083-config-no-files.t @@ -40,4 +40,4 @@ test() -> "Asking for a persistent key/value pair doesn't choke." ), - ok.
\ No newline at end of file + ok. diff --git a/test/etap/090-task-status.t b/test/etap/090-task-status.t index d2df4f91..45d38dff 100755 --- a/test/etap/090-task-status.t +++ b/test/etap/090-task-status.t @@ -17,33 +17,33 @@ check_status(Pid,ListPropLists) -> From = list_to_binary(pid_to_list(Pid)), Element = lists:foldl( fun(PropList,Acc) -> - case proplists:get_value(pid,PropList) of - From -> + case proplists:get_value(pid,PropList) of + From -> [PropList | Acc]; - _ -> + _ -> [] - end - end, + end + end, [], ListPropLists ), proplists:get_value(status,hd(Element)). loop() -> receive - {add, From} -> - Resp = couch_task_status:add_task("type", "task", "init"), - From ! {ok, self(), Resp}, - loop(); - {update, Status, From} -> - Resp = couch_task_status:update(Status), - From ! {ok, self(), Resp}, - loop(); - {update_frequency, Msecs, From} -> - Resp = couch_task_status:set_update_frequency(Msecs), - From ! {ok, self(), Resp}, - loop(); - {done, From} -> - From ! {ok, self(), ok} + {add, From} -> + Resp = couch_task_status:add_task("type", "task", "init"), + From ! {ok, self(), Resp}, + loop(); + {update, Status, From} -> + Resp = couch_task_status:update(Status), + From ! {ok, self(), Resp}, + loop(); + {update_frequency, Msecs, From} -> + Resp = couch_task_status:set_update_frequency(Msecs), + From ! {ok, self(), Resp}, + loop(); + {done, From} -> + From ! {ok, self(), ok} end. call(Pid, Command) -> @@ -86,15 +86,15 @@ test() -> etap:is( check_status(Pid1, couch_task_status:all()), <<"init">>, - "Task status was set to 'init'." + "Task status was set to 'init'." ), call(Pid1,update,"running"), etap:is( check_status(Pid1,couch_task_status:all()), <<"running">>, - "Status updated to 'running'." - ), + "Status updated to 'running'." + ), call(Pid2,add), @@ -107,15 +107,15 @@ test() -> etap:is( check_status(Pid2, couch_task_status:all()), <<"init">>, - "Second tasks's status was set to 'init'." - ), - + "Second tasks's status was set to 'init'." + ), + call(Pid2, update, "running"), etap:is( check_status(Pid2, couch_task_status:all()), <<"running">>, - "Second task's status updated to 'running'." - ), + "Second task's status updated to 'running'." + ), call(Pid3, add), @@ -128,15 +128,15 @@ test() -> etap:is( check_status(Pid3, couch_task_status:all()), <<"init">>, - "Third tasks's status was set to 'init'." - ), - + "Third tasks's status was set to 'init'." + ), + call(Pid3, update, "running"), etap:is( check_status(Pid3, couch_task_status:all()), <<"running">>, - "Third task's status updated to 'running'." - ), + "Third task's status updated to 'running'." + ), call(Pid3, update_frequency, 500), @@ -144,23 +144,23 @@ test() -> etap:is( check_status(Pid3, couch_task_status:all()), <<"still running">>, - "Third task's status updated to 'still running'." - ), + "Third task's status updated to 'still running'." + ), call(Pid3, update, "skip this update"), etap:is( check_status(Pid3, couch_task_status:all()), <<"still running">>, - "Status update dropped because of frequency limit." - ), + "Status update dropped because of frequency limit." + ), call(Pid3, update_frequency, 0), call(Pid3, update, "don't skip"), etap:is( check_status(Pid3, couch_task_status:all()), <<"don't skip">>, - "Status updated after reseting frequency limit." - ), + "Status updated after reseting frequency limit." + ), call(Pid1, done), |