Merge lp:~james-w/pkgme-devportal/enable-tests into lp:pkgme-devportal

Proposed by James Westby
Status: Merged
Approved by: James Westby
Approved revision: 23
Merged at revision: 22
Proposed branch: lp:~james-w/pkgme-devportal/enable-tests
Merge into: lp:pkgme-devportal
Diff against target: 29 lines (+9/-2)
2 files modified
devportalbinary/binary.py (+1/-1)
tarmac_tests.sh (+8/-1)
To merge this branch: bzr merge lp:~james-w/pkgme-devportal/enable-tests
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+84963@code.launchpad.net

Commit message

Run the tests in tarmac.

Description of the change

Hi,

This branch changes tarmac to run the tests for pkgme-binary.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Looks good.

review: Approve
Revision history for this message
Canonical CA Tarmac (ca-tarmac) wrote :
Download full text (3.2 KiB)

The attempt to merge lp:~james-w/pkgme-binary/enable-tests into lp:pkgme-binary failed. Below is the output from the failed tests.

Tests running...
======================================================================
ERROR: tests.test_binary.GuessDependenciesTests.test_guess_dependencies
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmpbJ0y4f/devportalbinary/tests/test_binary.py", line 308, in test_guess_dependencies
    deps = guess_dependencies(os.path.dirname(__file__))
  File "devportalbinary/binary.py", line 231, in guess_dependencies
    libraries = get_shared_library_dependencies(binaries, library_finder)
TypeError: get_shared_library_dependencies() takes exactly 1 argument (2 given)
======================================================================
ERROR: tests.test_binary_backend.BinaryBackendTests.test_build_depends
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tmpbJ0y4f/devportalbinary/tests/test_binary_backend.py", line 76, in test_build_depends
    deps = ', '.join(guess_dependencies(tempdir.path))
  File "devportalbinary/binary.py", line 231, in guess_dependencies
    libraries = get_shared_library_dependencies(binaries, library_finder)
TypeError: get_shared_library_dependencies() takes exactly 1 argument (2 given)

Ran 51 tests in 2.657s
FAILED (failures=2)

Branched 91 revision(s).
/tmp/tmpbJ0y4f/virtualenv/lib/python2.6/site-packages/distribute-0.6.10-py2.6.egg/setuptools/command/bdist_egg.py:422: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal
  symbols = dict.fromkeys(iter_symbols(code))
bzrlib/_readdir_pyx.c: In function '__pyx_f_6bzrlib_12_readdir_pyx__read_dir':
bzrlib/_readdir_pyx.c:992: warning: '__pyx_exc_lineno' may be used uninitialized in this function
bzrlib/_readdir_pyx.c:1035: warning: '__pyx_exc_lineno' may be used uninitialized in this function
bzrlib/_chk_map_pyx.c: In function '__pyx_f_6bzrlib_12_chk_map_pyx_safe_interned_string_from_size':
bzrlib/_chk_map_pyx.c:282: warning: cast from pointer to integer of different size
In file included from /usr/include/python2.6/Python.h:8,
                 from bzrlib/_patiencediff_c.c:28:
/usr/include/python2.6/pyconfig.h:1031:1: warning: "_POSIX_C_SOURCE" redefined
In file included from /usr/include/stdlib.h:25,
                 from bzrlib/_patiencediff_c.c:26:
/usr/include/features.h:210:1: warning: this is the location of the previous definition
bzrlib/_btree_serializer_pyx.c: In function '__pyx_f_6bzrlib_21_btree_serializer_pyx_safe_string_from_size':
bzrlib/_btree_serializer_pyx.c:880: warning: cast from pointer to integer of different size
bzrlib/_btree_serializer_pyx.c: In function '__pyx_f_6bzrlib_21_btree_serializer_pyx_safe_interned_string_from_size':
bzrlib/_btree_serializer_pyx.c:974: warning: cast from pointer to integer of different size
/tmp/tmpbJ0y4f/virtualenv/lib/python2.6/site-packages/distribute-0.6.10-py2.6.egg/setuptools/command/bdist_egg.py:422: UnicodeWarning: Unicode equal comparison failed to convert both arguments to U...

Read more...

22. By James Westby

Merge trunk.

23. By James Westby

Fix the broken tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'devportalbinary/binary.py'
2--- devportalbinary/binary.py 2011-12-08 12:53:11 +0000
3+++ devportalbinary/binary.py 2011-12-08 15:46:23 +0000
4@@ -228,7 +228,7 @@
5 library_finder=needed_libraries_from_objdump,
6 libraries_to_deps=get_packages_for_libraries):
7 binaries = iter_binaries(path)
8- libraries = get_shared_library_dependencies(binaries, library_finder)
9+ libraries = get_shared_library_dependencies(binaries)
10 deps = libraries_to_deps(libraries, 'i386')
11 return deps
12
13
14=== modified file 'tarmac_tests.sh'
15--- tarmac_tests.sh 2011-12-07 20:33:05 +0000
16+++ tarmac_tests.sh 2011-12-08 15:46:23 +0000
17@@ -2,4 +2,11 @@
18
19 set -e
20
21-echo "No tests yet."
22+virtualenv --no-site-packages virtualenv > log
23+. ./virtualenv/bin/activate >> log
24+pip install discover >> log
25+bzr branch lp:pkgme pkgme >> log
26+(cd pkgme && python setup.py develop) >> log
27+python setup.py develop >> log
28+python -m testtools.run discover devportalbinary
29+python -m testtools.run acceptance.tests

Subscribers

People subscribed via source and target branches