~xnox/upstart/do-not-launch-session-dbus

« back to all changes in this revision

Viewing changes to scripts/tests/test_pyupstart_session_init.py

  • Committer: James Hunt
  • Date: 2014-03-05 11:15:08 UTC
  • mfrom: (1595.1.1 trunk)
  • Revision ID: james.hunt@ubuntu.com-20140305111508-tiarpodgoko5tpvu
* Merged lp:~xnox/upstart/pyflakes3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
import os
31
31
import sys
32
32
import re
33
 
import json
34
33
 
35
34
base_dir = os.path.abspath(os.path.dirname(__file__))
36
35
module_dir = os.path.normpath(os.path.realpath(base_dir + os.sep + '..'))
81
80
            tmp = '{}{}{}'.format(DEFAULT_SESSION_INSTALL_PATH, os.sep, self.REEXEC_CONF)
82
81
            if os.path.exists(tmp):
83
82
                print('INFO: UPSTART_TEST_USE_INSTALLED_CONF set - using {} rather than {}'.format(tmp, self.reexec_conf))
84
 
                reexec_conf = tmp
 
83
                self.reexec_conf = tmp
85
84
 
86
85
        self.assertTrue(os.path.exists(self.file_bridge_conf))
87
86
        self.assertTrue(os.path.exists(self.reexec_conf))