Merge into trunk : fix1182895 : Code : U1DB

Status:

Merged

Approved by:

dobey on 2013-05-23

Approved revision:

437

Merged at revision:

437

Proposed branch:

lp:~pedronis/u1db/fix1182895

Merge into:

lp:u1db

Diff against target:

11 lines (+1/-1)

1 file modified

u1db/tests/test_https.py (+1/-1)

To merge this branch:

bzr merge lp:~pedronis/u1db/fix1182895

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
dobey (community)		2013-05-22	Approve on 2013-05-22
Review via email: mp+165219@code.launchpad.net

Commit message

be less strict about the error message we get testing failing cert verification

Description of the change

be less strict about the error message we get testing failing cert verification

Revision history for this message

dobey (dobey) on 2013-05-22:

#

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2013-05-22:

#

Download full text (6.7 KiB)

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU 4.8.0
-- The CXX compiler identification is GNU 4.8.0
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.30.0")
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")
-- checking for module 'oauth'
-- found oauth, version 1.0.1
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so
-- checking for module 'json'
-- found json, version 0.10
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so
-- checking for module 'sqlite3'
-- found sqlite3, version 3.7.16.2
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db
Scanning dependencies of target ReplicatePythonSourceTree
[ 0%] Built target ReplicatePythonSourceTree
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target build-debug-for-tests
running build_ext
cythoning u1db/tests/c_backend_wrapper.pyx to u1db/tests/c_backend_wrapper.c
building 'u1db.tests.c_backend_wrapper' extension
creating build
creating build/temp.linux-x86_64-2.7-pydebug
creating build/temp.linux-x86_64-2.7-pydebug/u1db
creating build/temp.linux-x86_64-2.7-pydebug/u1db/tests
x86_64-linux-gnu-gcc -pthread -fno-strict-aliasing -g -O0 -Wall -Wstrict-prototypes -fPIC -Iinclude -I/mnt/tarmac/cache/u1db/include -I/usr/include/python2.7_d -c u1db/tests/c_backend_wrapper.c -o build/temp.linux-x86_64-2.7-pydebug/u1db/tests/c_backend_wrapper.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -g -O0 -Wall -Wstrict-prototypes -g -O0 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -g -O0 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security build/temp.linux-x86_64-2.7-pydebug/u1db/tests/c_backend_wrapper.o -Lsrc -lu1db -lsqlite3 -loauth -lcurl -ljson -o /mnt/tarmac/cache/u1db/u1db/tests/c_backend_wrapper_d.so
[100%] Built target build-debug-for-tests
Scanning dependencies of target check-valgrind
Tests runni...

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU 4.8.0
-- The CXX compiler identification is GNU 4.8.0
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython  
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.30.0") 
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26") 
-- checking for module 'oauth'
--   found oauth, version 1.0.1
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so  
-- checking for module 'json'
--   found json, version 0.10
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so  
-- checking for module 'sqlite3'
--   found sqlite3, version 3.7.16.2
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so  
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db
Scanning dependencies of target ReplicatePythonSourceTree
[  0%] Built target ReplicatePythonSourceTree
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target build-debug-for-tests
running build_ext
cythoning u1db/tests/c_backend_wrapper.pyx to u1db/tests/c_backend_wrapper.c
building 'u1db.tests.c_backend_wrapper' extension
creating build
creating build/temp.linux-x86_64-2.7-pydebug
creating build/temp.linux-x86_64-2.7-pydebug/u1db
creating build/temp.linux-x86_64-2.7-pydebug/u1db/tests
x86_64-linux-gnu-gcc -pthread -fno-strict-aliasing -g -O0 -Wall -Wstrict-prototypes -fPIC -Iinclude -I/mnt/tarmac/cache/u1db/include -I/usr/include/python2.7_d -c u1db/tests/c_backend_wrapper.c -o build/temp.linux-x86_64-2.7-pydebug/u1db/tests/c_backend_wrapper.o
x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -g -O0 -Wall -Wstrict-prototypes -g -O0 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -g -O0 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security build/temp.linux-x86_64-2.7-pydebug/u1db/tests/c_backend_wrapper.o -Lsrc -lu1db -lsqlite3 -loauth -lcurl -ljson -o /mnt/tarmac/cache/u1db/u1db/tests/c_backend_wrapper_d.so
[100%] Built target build-debug-for-tests
Scanning dependencies of target check-valgrind
Tests running...

[200764 refs]
==5691== Memcheck, a memory error detector
==5691== Copyright (C) 2002-2012, and GNU GPL'd, by Julian Seward et al.
==5691== Using Valgrind-3.8.1 and LibVEX; rerun with -h for copyright info
==5691== Command: python-dbg -m testtools.run discover
==5691== 
==5691== Invalid read of size 8
==5691==    at 0xA1C1790: extract_field_values (u1db_query.c:308)
==5691==    by 0xA1C1CFE: op_combine (u1db_query.c:499)
==5691==    by 0xA1C2081: evaluate_index_and_insert_into_db (u1db_query.c:1570)
==5691==    by 0xA1C2798: sqlite_cb_to_field_cb (u1db_query.c:1494)
==5691==    by 0x9B37EBF: sqlite3_exec (in /usr/lib/x86_64-linux-gnu/libsqlite3.so.0.8.6)
==5691==    by 0xA1C3E91: u1db__update_indexes (u1db_query.c:1512)
==5691==    by 0xA1BBC50: write_doc (u1db.c:483)
==5691==    by 0xA1BE778: u1db_put_doc (u1db.c:689)
==5691==    by 0xA1BE8C4: u1db_create_doc_from_json (u1db.c:358)
==5691==    by 0xA19DB6C: __pyx_pf_4u1db_5tests_17c_backend_wrapper_9CDatabase_18create_doc_from_json (c_backend_wrapper.c:10261)
==5691==    by 0xA19D97E: __pyx_pw_4u1db_5tests_17c_backend_wrapper_9CDatabase_19create_doc_from_json (c_backend_wrapper.c:10180)
==5691==    by 0x487578: PyCFunction_Call (methodobject.c:85)
==5691==  Address 0x0 is not stack'd, malloc'd or (recently) free'd
==5691== 
==5691== 
==5691== Process terminating with default action of signal 11 (SIGSEGV): dumping core
==5691==  Access not within mapped region at address 0x0
==5691==    at 0xA1C1790: extract_field_values (u1db_query.c:308)
==5691==    by 0xA1C1CFE: op_combine (u1db_query.c:499)
==5691==    by 0xA1C2081: evaluate_index_and_insert_into_db (u1db_query.c:1570)
==5691==    by 0xA1C2798: sqlite_cb_to_field_cb (u1db_query.c:1494)
==5691==    by 0x9B37EBF: sqlite3_exec (in /usr/lib/x86_64-linux-gnu/libsqlite3.so.0.8.6)
==5691==    by 0xA1C3E91: u1db__update_indexes (u1db_query.c:1512)
==5691==    by 0xA1BBC50: write_doc (u1db.c:483)
==5691==    by 0xA1BE778: u1db_put_doc (u1db.c:689)
==5691==    by 0xA1BE8C4: u1db_create_doc_from_json (u1db.c:358)
==5691==    by 0xA19DB6C: __pyx_pf_4u1db_5tests_17c_backend_wrapper_9CDatabase_18create_doc_from_json (c_backend_wrapper.c:10261)
==5691==    by 0xA19D97E: __pyx_pw_4u1db_5tests_17c_backend_wrapper_9CDatabase_19create_doc_from_json (c_backend_wrapper.c:10180)
==5691==    by 0x487578: PyCFunction_Call (methodobject.c:85)
==5691==  If you believe this happened as a result of a stack
==5691==  overflow in your program's main thread (unlikely but
==5691==  possible), you can try to increase the size of the
==5691==  main thread stack using the --main-stacksize= flag.
==5691==  The main thread stack size used in this run was 16777216.
==5691== 
==5691== HEAP SUMMARY:
==5691==     in use at exit: 55,842,651 bytes in 77,333 blocks
==5691==   total heap usage: 661,561 allocs, 584,228 frees, 407,127,812 bytes allocated
==5691== 
==5691== LEAK SUMMARY:
==5691==    definitely lost: 0 bytes in 0 blocks
==5691==    indirectly lost: 0 bytes in 0 blocks
==5691==      possibly lost: 37,036,787 bytes in 73,481 blocks
==5691==    still reachable: 18,805,864 bytes in 3,852 blocks
==5691==         suppressed: 0 bytes in 0 blocks
==5691== Rerun with --leak-check=full to see details of leaked memory
==5691== 
==5691== For counts of detected and suppressed errors, rerun with: -v
==5691== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 47432 from 118)
make[3]: *** [CMakeFiles/check-valgrind] Segmentation fault (core dumped)
make[2]: *** [CMakeFiles/check-valgrind.dir/all] Error 2
make[1]: *** [CMakeFiles/check-valgrind.dir/rule] Error 2
make: *** [check-valgrind] Error 2

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2013-05-23:

#

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2013-05-23:

#

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

/bin/sh: 1: cmake: not found

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2013-05-23:

#

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so
-- checking for module 'oauth'
-- found oauth, version 0.9.4
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so
-- checking for module 'json'
-- found json, version 0.9
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so
-- checking for module 'sqlite3'
-- found sqlite3, version 3.7.9
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target ReplicatePythonSourceTree
[100%] Built target ReplicatePythonSourceTree
Scanning dependencies of target build-debug-for-tests

/bin/sh: 1: python-dbg: not found
make[3]: *** [CMakeFiles/build-debug-for-tests] Error 127
make[2]: *** [CMakeFiles/build-debug-for-tests.dir/all] Error 2
make[1]: *** [CMakeFiles/check-valgrind.dir/rule] Error 2
make: *** [check-valgrind] Error 2

The attempt to merge lp:~pedronis/u1db/fix1182895 into lp:u1db failed. Below is the output from the failed tests.

-- The C compiler identification is GNU
-- The CXX compiler identification is GNU
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found Cython: /usr/bin/cython 
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so 
-- checking for module 'oauth'
--   found oauth, version 0.9.4
-- Found OAuth: /usr/lib/x86_64-linux-gnu/liboauth.so 
-- checking for module 'json'
--   found json, version 0.9
-- Found JSON: /usr/lib/x86_64-linux-gnu/libjson.so 
-- checking for module 'sqlite3'
--   found sqlite3, version 3.7.9
-- Found Sqlite3: /usr/lib/x86_64-linux-gnu/libsqlite3.so 
-- Configuring done
-- Generating done
-- Build files have been written to: /mnt/tarmac/cache/u1db
[ 11%] Generating u1db_schema.c
Scanning dependencies of target u1db
[ 22%] Building C object src/CMakeFiles/u1db.dir/mkstemp_compat.c.o
[ 33%] Building C object src/CMakeFiles/u1db.dir/u1db.c.o
[ 44%] Building C object src/CMakeFiles/u1db.dir/u1db_http_sync_target.c.o
[ 55%] Building C object src/CMakeFiles/u1db.dir/u1db_query.c.o
[ 66%] Building C object src/CMakeFiles/u1db.dir/u1db_sync_target.c.o
[ 77%] Building C object src/CMakeFiles/u1db.dir/u1db_uuid.c.o
[ 88%] Building C object src/CMakeFiles/u1db.dir/u1db_vectorclock.c.o
[100%] Building C object src/CMakeFiles/u1db.dir/u1db_schema.c.o
Linking C static library libu1db.a
[100%] Built target u1db
Scanning dependencies of target ReplicatePythonSourceTree
[100%] Built target ReplicatePythonSourceTree
Scanning dependencies of target build-debug-for-tests

/bin/sh: 1: python-dbg: not found
make[3]: *** [CMakeFiles/build-debug-for-tests] Error 127
make[2]: *** [CMakeFiles/build-debug-for-tests.dir/all] Error 2
make[1]: *** [CMakeFiles/check-valgrind.dir/rule] Error 2
make: *** [check-valgrind] Error 2

1	=== modified file 'u1db/tests/test_https.py'
2	--- u1db/tests/test_https.py 2012-10-02 13:54:36 +0000
3	+++ u1db/tests/test_https.py 2013-05-22 18:43:25 +0000
4	@@ -96,7 +96,7 @@
5	try:
6	remote_target.record_sync_info('other-id', 2, 'T-id')
7	except ssl.SSLError, e:
8	- self.assertIn("certificate verify failed", str(e))
9	+ self.assertIn("certificate", str(e))
10	else:
11	self.fail("certificate verification should have failed.")
12

U1DB

Merge lp:~pedronis/u1db/fix1182895 into lp:u1db

Commit message

Description of the change

Preview Diff

Subscribers