Whitespace
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mango/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mango/commit/1de64eab Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mango/tree/1de64eab Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mango/diff/1de64eab Branch: refs/heads/2787-merge-repos Commit: 1de64eabbf9af6a56562acdf3b71fa0c4c98fd0f Parents: 17e4abf Author: Tony Sun <tony....@cloudant.com> Authored: Tue Sep 8 11:22:03 2015 -0700 Committer: Tony Sun <tony....@cloudant.com> Committed: Tue Sep 8 11:22:03 2015 -0700 ---------------------------------------------------------------------- src/mango_cursor_text.erl | 1 - src/mango_error.erl | 2 +- test/01-index-crud-test.py | 4 ++-- test/07-text-custom-field-list-test.py | 2 +- test/literal_gen.py | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/1de64eab/src/mango_cursor_text.erl ---------------------------------------------------------------------- diff --git a/src/mango_cursor_text.erl b/src/mango_cursor_text.erl index 971d153..847b04c 100644 --- a/src/mango_cursor_text.erl +++ b/src/mango_cursor_text.erl @@ -301,4 +301,3 @@ get_json_docs(DbName, Hits) -> {Sort, not_found} end end, Hits). - http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/1de64eab/src/mango_error.erl ---------------------------------------------------------------------- diff --git a/src/mango_error.erl b/src/mango_error.erl index 9b7ae82..f0a8ee2 100644 --- a/src/mango_error.erl +++ b/src/mango_error.erl @@ -58,7 +58,7 @@ info(mango_cursor_text, multiple_text_indexes) -> <<"multiple_text_indexes">>, <<"You must specify an index with the `use_index` parameter.">> }; -info(mango_cursor_text, {text_search_error, {error, {bad_request, Msg}}}) +info(mango_cursor_text, {text_search_error, {error, {bad_request, Msg}}}) when is_binary(Msg) -> { 400, http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/1de64eab/test/01-index-crud-test.py ---------------------------------------------------------------------- diff --git a/test/01-index-crud-test.py b/test/01-index-crud-test.py index 021d66e..24aa99d 100644 --- a/test/01-index-crud-test.py +++ b/test/01-index-crud-test.py @@ -227,7 +227,7 @@ class IndexCrudTests(mango.DbPerClass): assert e.response.status_code == 404 else: raise AssertionError("bad index delete") - + @unittest.skip def test_create_text_idx(self): fields = [ @@ -246,7 +246,7 @@ class IndexCrudTests(mango.DbPerClass): ] return raise AssertionError("index not created") - + @unittest.skip def test_create_bad_text_idx(self): bad_fields = [ http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/1de64eab/test/07-text-custom-field-list-test.py ---------------------------------------------------------------------- diff --git a/test/07-text-custom-field-list-test.py b/test/07-text-custom-field-list-test.py index 8d68a1f..f060d79 100644 --- a/test/07-text-custom-field-list-test.py +++ b/test/07-text-custom-field-list-test.py @@ -65,7 +65,7 @@ class CustomFieldsTest(mango.UserDocsTextTests): docs = self.db.find({"location.state": "New Hampshire"}) assert len(docs) == 1 assert docs[0]["user_id"] == 10 - + # Since our FIELDS list only includes "name\\.first", we should # get an error when we try to search for "name.first", since the index # for that field does not exist. http://git-wip-us.apache.org/repos/asf/couchdb-mango/blob/1de64eab/test/literal_gen.py ---------------------------------------------------------------------- diff --git a/test/literal_gen.py b/test/literal_gen.py index 7cf60dd..cf46017 100644 --- a/test/literal_gen.py +++ b/test/literal_gen.py @@ -14,7 +14,7 @@ import random from string import digits, hexdigits def joiner(*items): - return ''.join(item() for item in items) + return ''.join(item() for item in items) def roll(item, n1, n2=None): n2 = n2 or n1