← Back to branch summary

~ubuntu-branches/ubuntu/quantal/deja-dup/quantal

« back to all changes in this revision

Viewing changes to tests/base.py

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2012-02-23 12:42:44 UTC
  • mfrom: (1.1.41)
  • Revision ID: package-import@ubuntu.com-20120223124244-hnuzoxlc3qtcqz41
Tags: 21.90-0ubuntu1
* New upstream release
* debian/rules:
  - Enable 'make check' by default again
* debian/control:
  - Add dbus-x11 and desktop-file-utils as Build-Depends for tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/base.py
79
79
  environ['LANG'] = 'C'
80
80
  environ['DEJA_DUP_TESTING'] = '1'
81
81
 
82
 
  extra_paths = ':'.join(['%s/../%s' % (builddir, x) for x in ['deja-dup', 'preferences', 'monitor']]) + ':'
 
82
  if 'DEJA_DUP_TEST_SYSTEM' in environ and environ['DEJA_DUP_TEST_SYSTEM'] == '1':
 
83
    extra_paths = ''
 
84
  else:
 
85
    extra_paths = ':'.join(['%s/../%s' % (builddir, x) for x in ['deja-dup', 'preferences', 'monitor']]) + ':'
83
86
  extra_pythonpaths = ''
84
87
  
85
88
  version = None
121
124
  #os.system('pkill -f ldtpd\\.main; sleep 1')
122
125
  #ldtp.getwindowlist()/reload(ldtp)
123
126
 
124
 
  process = subprocess.Popen(['/usr/lib/d-conf/dconf-service'], stdout=subprocess.PIPE)
 
127
  process = subprocess.Popen(['/usr/lib/dconf/dconf-service'], stdout=subprocess.PIPE)
125
128
  cleanup_pids += [process.pid]
126
129
 
127
130
  environ['PYTHONPATH'] = extra_pythonpaths + (environ['PYTHONPATH'] if 'PYTHONPATH' in environ else '')