Merge into trunk : previews : Code : Ubuntu Rest Scopes

Status:	Merged
Approved by:	Facundo Batista on 2014-02-05
Approved revision:	10
Merged at revision:	12
Proposed branch:	lp://staging/~facundo/ubuntu-rest-scopes/previews
Merge into:	lp://staging/ubuntu-rest-scopes
Diff against target:	612 lines (+472/-17) 10 files modified src/scopes/__init__.py (+46/-6) src/scopes/tests/__init__.py (+16/-0) src/scopes/tests/fixtures/wikipedia-extraction.json (+1/-0) src/scopes/tests/fixtures/wikipedia-otherlang.xml (+1/-0) src/scopes/tests/fixtures/wikipedia-simple.xml (+1/-0) src/scopes/tests/test_base.py (+117/-0) src/scopes/tests/test_wikipedia.py (+117/-0) src/scopes/wikipedia.py (+62/-8) test (+1/-3) utilities/check_scopes.py (+110/-0)
To merge this branch:	bzr merge lp://staging/~facundo/ubuntu-rest-scopes/previews
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Guillermo Gonzalez		2014-02-05	Approve on 2014-02-05
Review via email: mp+204981@code.staging.launchpad.net

Commit message

Previews infrastructure.

Description of the change

Previews infrastructure.

Also added previews for Wikipedia sccope.

Tests included for everything (the wikipedia scope, including search, and the new infrastructure).

Revision history for this message

Guillermo Gonzalez (verterok) wrote on 2014-02-05:

#

+1

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2014-02-05:

#

Download full text (5.2 KiB)

The attempt to merge lp:~facundo/ubuntu-rest-scopes/previews into lp:ubuntu-rest-scopes failed. Below is the output from the failed tests.

....EEEEEEEE........EEE...........
======================================================================
ERROR: test_bad_locale (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_broken_prev_result (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_latitude_longitude (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_latitude_only (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_locale_C (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_longitude_only (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/mnt/tarmac/cache/ubuntu-rest-scopes/trunk/src/scopes/tests/test_base.py", line 200, in setUp
self.app = scopes.SimpleApp()
TypeError: __init__() takes exactly 2 arguments (1 given)

======================================================================
ERROR: test_no_locale_no_country (src.scopes.tests.test_base.PreviewParamsValidationTestCase)
----------------------------------------------------------------------
Traceback (most recent call las...

Ubuntu Rest Scopes

Merge lp://staging/~facundo/ubuntu-rest-scopes/previews into lp://staging/ubuntu-rest-scopes

Commit message

Description of the change

Preview Diff

Subscribers