desktopcouch

Merge lp://staging/~mandel/desktopcouch/move_testing_to_platform into lp://staging/desktopcouch

  1. move_testing_to_platform
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 255
Merged at revision: 251
Proposed branch: lp://staging/~mandel/desktopcouch/move_testing_to_platform
Merge into: lp://staging/desktopcouch
Diff against target: 348 lines (+167/-110)
6 files modified
desktopcouch/application/platform/__init__.py (+2/-1)
desktopcouch/application/platform/linux/keyring.py (+89/-0)
desktopcouch/application/platform/linux/tests/test_keyring.py (+19/-3)
desktopcouch/application/plugins/tests/test_plugins.py (+1/-0)
desktopcouch/application/tests/__init__.py (+4/-106)
run-tests.bat (+52/-0)
To merge this branch: bzr merge lp://staging/~mandel/desktopcouch/move_testing_to_platform
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+45501@code.staging.launchpad.net

Commit message

The following changes has been perform to allow tests to be ran on other platforms besides linux:
    - skipped TestGnomeKeyring in those platforms that are not linux. The test will be ran on linux always and will raise an import error if gnomekeyring is not present. (lp:699749)
    - moved the TestKeyring class to the platform module. Used the set_application_name function to set the name of the process running the tests. (lp:699743)
    - added a batch that will allow to run the tests on windows. (lp:699757)

Description of the change

The following changes has been perform to allow tests to be ran on other platforms besides linux:
    - skipped TestGnomeKeyring in those platforms that are not linux. The test will be ran on linux always and will raise an import error if gnomekeyring is not present. (lp:699749)
    - moved the TestKeyring class to the platform module. Used the set_application_name function to set the name of the process running the tests. (lp:699743)
    - added a batch that will allow to run the tests on windows. (lp:699757)

To post a comment you must log in.
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Looks good. Well except for the .bat file, but I don't think it's meant to. :P

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

It is as nice as a batch script can look!

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~mandel/desktopcouch/move_testing_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.

Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmpU82f73/data/couchdb.html
Apache CouchDB has been shutdown.

+ u1trial -c desktopcouch
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 226, in <module>
    main()
  File "/usr/bin/u1trial", line 223, in main
    TestRunner().run(testpath, options)
  File "/usr/bin/u1trial", line 166, in run
    suite = self._collect_tests(path, options.test, options.ignored)
  File "/usr/bin/u1trial", line 146, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 82, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/var/cache/tarmac/desktopcouch/trunk/desktopcouch/application/platform/linux/tests/test_keyring.py", line 25, in <module>
    from ubuntuone.devtools.testcase import skipIf
ImportError: cannot import name skipIf

Revision history for this message
Manuel de la Peña (mandel) wrote :

The above error is due to the use of an old version of ubuntuone-dev-tools.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches