Zorba

Merge lp:~zorba-coders/zorba/disable-sc3-test into lp:zorba

  1. disable-sc3-test
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 10629
Merged at revision: 10629
Proposed branch: lp:~zorba-coders/zorba/disable-sc3-test
Merge into: lp:zorba
Diff against target: 9 lines (+0/-2)
1 file modified
test/update/Queries/zorba/store/sc3.spec (+0/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/disable-sc3-test
Reviewer Review Type Date Requested Status
Paul J. Lucas Approve
Chris Hillery Approve
Review via email: mp+89809@code.launchpad.net

Commit message

Remove test case sc3_ex3 in order to merge the removal of the non-core JSON module. sc3_ex3 will be re-added along with the core JSON module.

Description of the change

The test case sc3_ex3 depends on the non-core JSON module. This non-core module is being removed (to be replaced by a new core JSON module), but obviously doing so causes this core test case to fail. So, we need to remove the test case temporarily to successfully merge the non-core module change. It will be re-enabled along with the merge of the core JSON module.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) wrote :

I'll take your word for it.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/disable-sc3-test-2012-01-24T01-02-59.785Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job disable-sc3-test-2012-01-24T01-02-59.785Z 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/update/Queries/zorba/store/sc3.spec'
2--- test/update/Queries/zorba/store/sc3.spec 2011-08-06 00:15:24 +0000
3+++ test/update/Queries/zorba/store/sc3.spec 2012-01-24 00:53:28 +0000
4@@ -1,5 +1,3 @@
5 State: sc3_ex1
6 Args: -x input-context:=$UPDATE_SRC_DIR/Queries/zorba/store/meat_poultry.csv
7 State: sc3_ex2
8-State: sc3_ex3
9-Compare sc3_ex3.xml.res Text

Subscribers

People subscribed via source and target branches