@@ -22,6 +22,7 @@
22import subprocess
22import subprocess
23import unittest
23import unittest
25+from autopilot import platform
25from unity8.shell.emulators import UnityEmulatorBase
26from unity8.shell.emulators import UnityEmulatorBase
26from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
27from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
@@ -31,7 +32,7 @@ class SystemIntegrationTests(UnityTestCase):
32 scenarios = _get_device_emulation_scenarios()
33 scenarios = _get_device_emulation_scenarios()
34− @unittest.skip("Disabled until we can investigate jenkins failure")
35+ @unittest.skipIf(platform.model() == "Desktop", "Test is broken on otto, see bug 1281634.")
35 def test_networkmanager_integration(self):
36 def test_networkmanager_integration(self):
36 self.launch_unity()
37 self.launch_unity()