~mvo/software-center/fix-index-update-terms-bug

« back to all changes in this revision

Viewing changes to tests/gtk3/test_app.py

  • Committer: Michael Vogt
  • Date: 2012-07-19 09:29:16 UTC
  • mfrom: (2989.33.20 5.2)
  • Revision ID: michael.vogt@ubuntu.com-20120719092916-dei4mt5hhyxkqm23
merged from the 5.2 branch, resolve conflicts (many :/) and fix failing tests in test_unity_launcher_integration via setUpClass and updates to the DesktopFilepathConversionTestCase bits to use os.path.join()

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
from collections import defaultdict
5
5
from functools import partial
6
 
 
7
6
import xapian
8
7
 
9
8
from mock import Mock