← Back to branch summary

~canonical-platform-qa/unity8/1421009-hangs-on-boot

« back to all changes in this revision

Viewing changes to tests/autopilot/unity8/shell/tests/test_upstart.py

  • Committer: CI Train Bot
  • Author(s): Leo Arias, Leonardo Arias Fonseca
  • Date: 2015-04-22 14:46:14 UTC
  • mfrom: (1730.5.2 autopilot_toolkit_scenarios)
  • Revision ID: ci-train-bot@canonical.com-20150422144614-smtftddjy12we90g
For autopilot tests, use the device simulation scenarios from the toolkit.
Approved by: Albert Astals Cid

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/unity8/shell/tests/test_upstart.py
29
29
from testtools.matchers import Equals, MismatchError
30
30
from autopilot.matchers import Eventually
31
31
from autopilot.introspection import get_proxy_object_for_existing_process
 
32
from ubuntuuitoolkit import ubuntu_scenarios
32
33
 
33
34
from unity8 import get_binary_path
34
35
from unity8.shell.emulators import UnityEmulatorBase
35
 
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
36
from unity8.shell.tests import UnityTestCase
36
37
 
37
38
import logging
38
39
 
41
42
 
42
43
class UpstartIntegrationTests(UnityTestCase):
43
44
 
44
 
    scenarios = _get_device_emulation_scenarios()
 
45
    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
45
46
 
46
47
    def _get_status(self):
47
48
        pid, status = os.waitpid(