Merge lp:~zorba-coders/zorba/couchbase-module_null into lp:zorba/couchbase-module

Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~zorba-coders/zorba/couchbase-module_null
Merge into: lp:zorba/couchbase-module
Diff against target: 11 lines (+2/-1)
1 file modified
test/Queries/couchbase_module/view.xq (+2/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/couchbase-module_null
Reviewer Review Type Date Requested Status
William Candillon Approve
Matthias Brantner Approve
Review via email: mp+155128@code.launchpad.net

This proposal supersedes a proposal from 2013-03-23.

Commit message

fixed tests in preparation for merge of new jsoniq null semantics

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~zorba-coders/zorba/couchbase-module_null into lp:zorba/couchbase-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job couchbase-module_null-2013-03-23T02-03-42.26Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~zorba-coders/zorba/couchbase-module_null into lp:zorba/couchbase-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job couchbase-module_null-2013-03-23T02-56-49.111Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue job couchbase-module_null-2013-03-24T03-59-40.238Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job couchbase-module_null-2013-03-24T06-06-41.318Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/Queries/couchbase_module/view.xq'
2--- test/Queries/couchbase_module/view.xq 2013-03-24 03:48:26 +0000
3+++ test/Queries/couchbase_module/view.xq 2013-03-24 05:28:20 +0000
4@@ -14,5 +14,6 @@
5 variable $view-name := cb:create-view($instance, $cb-document, $cb-view, {"key":"doc.view"});
6 variable $data := cb:view($instance, $view-name, {"stale" : "false"});
7 for $d in jn:members($data("rows"))
8-where $d("key") >0
9+let $key := $d("key")
10+where not(jn:is-null($key)) and $key >0
11 return $d

Subscribers

People subscribed via source and target branches

to all changes: