Merge lp:~zorba-coders/zorba/fix-website-failures into lp:zorba
Proposed by
Chris Hillery
Status: | Merged |
---|---|
Approved by: | Matthias Brantner |
Approved revision: | 10644 |
Merged at revision: | 10644 |
Proposed branch: | lp:~zorba-coders/zorba/fix-website-failures |
Merge into: | lp:zorba |
Diff against target: |
354 lines (+46/-31) 24 files modified
CMakeLists.txt (+3/-2) include/zorba/config.h.cmake (+3/-0) modules/com/zorba-xquery/www/modules/CMakeLists.txt (+3/-0) src/context/static_context.cpp (+4/-3) src/util/http_util.cpp (+7/-2) src/util/http_util.h (+0/-2) test/http-test-data/docroot/http-test-data/http2.xml (+4/-0) test/rbkt/Queries/zorba/fetch/fetch_bogus2.xq (+1/-1) test/rbkt/Queries/zorba/store/example_3.xq (+4/-4) test/rbkt/Queries/zorba/versioning/import-chain1.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import-chain2.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import1.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import2.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import3.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import4.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import5.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import6.xq (+1/-1) test/rbkt/Queries/zorba/versioning/import7.xq (+1/-1) test/rbkt/modules/CMakeLists.txt (+3/-3) test/rbkt/modules/bad-ver.xq (+1/-1) test/rbkt/modules/module-A.xq (+1/-1) test/rbkt/modules/module-B.xq (+1/-1) test/rbkt/modules/ver.xq (+1/-1) test/rbkt/modules/ver2.xq (+1/-1) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/fix-website-failures |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Chris Hillery | Approve | ||
Review via email: mp+91574@code.launchpad.net |
Commit message
Several fixes related to test breakages caused by zorba-xquery.com changes:
1. Don't attempt HTTP resolution w/ HttpStream if Zorba compiled without CURL.
2. store/example_3 test: load content from zorbatest site like other tests.
3. fetch_bogus2 and impot5 test: change "ver" test module to be identified with a flworfound.org URI, so we'll get a 404 when loading it wrong. (Both example.com and zorba-xquery.com don't return 404 for unknown URLs.)
Description of the change
This fixes several problems either caused by the recent zorba-xquery.com changes, or discovered while implementing those fixes.
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ fix-website- failures- 2012-02- 05T12-42- 57.03Z/ log.html
Log at: http://