Merge lp:~sbaldassin/ubuntu-system-tests/indicators_tests into lp:ubuntu-system-tests

[Santiago Baldassin]

Indicators test cases

This mp update the system tests helpers to run the indicator test cases

@run_tests: ubuntu_system_tests.tests.indicators.test_indicator_datetime ubuntu_system_tests.tests.indicators.test_indicator_bluetooth ubuntu_system_tests.tests.indicators.test_indicator_battery ubuntu_system_tests.tests.indicators.test_indicator_sound.SoundIndicatorTestCase

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:516
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1187/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/29
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2162/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1187/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:516
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1187/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/29
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2162
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2163/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1187/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sbaldassin/ubuntu-system-tests/indicators_tests]

517. By Santiago Baldassin on 2017-03-21

Updating the rest of the indicators test cases

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1188/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/35
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2165/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1188/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1188/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/35
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2165
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2166/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1188/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1190/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/38
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2169/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1190/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1190/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/38
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2169
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2170/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1190/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1191/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/39
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2171/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1191/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1191/
Executed test runs:
    UNSTABLE: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/39
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2171
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2172/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1191/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1192/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/40
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2173/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1192/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:517
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1193/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/41
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2174/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1193/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

Although the tests are passing, I'm seeing this import error during the test log: http://pastebin.ubuntu.com/24223453/

I think other thing to consider is where tests have been changed to be ethernet specific. On real hardware where wifi is supported (e.g. dragonboard), the ethernet indicator would be replaced by the wifi indicator. So can we make the tests more generic? e.g. test_ethernet_settings_item_open_correct_page changes to test_network_settings_item_open_correct_page, and then open the relevant indicator based on whether wifi of ethernet is supported.

Some other comments below.

review: Needs Fixing

[Santiago Baldassin (sbaldassin)]

Thanks for the feedback Richard.
Completely agree with the comment about making the tests more generic.
Replies inline

[lp:~sbaldassin/ubuntu-system-tests/indicators_tests]

518. By Santiago Baldassin on 2017-03-23

Addressing comments from the reviews

519. By Santiago Baldassin on 2017-03-23

Merge from trunk

520. By Santiago Baldassin on 2017-03-23

Fixing flake8 issues

521. By Santiago Baldassin on 2017-03-23

Removing import error

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:521
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1208/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2200/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1208/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sbaldassin/ubuntu-system-tests/indicators_tests]

522. By Santiago Baldassin on 2017-03-23

Fixing flake8

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:522
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1209/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/64
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2201/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1209/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

see reply below

[lp:~sbaldassin/ubuntu-system-tests/indicators_tests]

523. By Santiago Baldassin on 2017-03-30

Addressing comments from the reviews

[Santiago Baldassin (sbaldassin)]

Comment addressed

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:523
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1229/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2241/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1229/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sbaldassin/ubuntu-system-tests/indicators_tests]

524. By Santiago Baldassin on 2017-03-30

Fixing flake8 issues

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:524
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1234/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/ust_run_tests/105
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2253/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/1234/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

LGTM

review: Approve

=== modified file 'ubuntu_system_tests/helpers/indicators/cpo.py'
--- ubuntu_system_tests/helpers/indicators/cpo.py	2016-12-02 12:16:41 +0000
+++ ubuntu_system_tests/helpers/indicators/cpo.py	2017-03-30 19:25:29 +0000
@@ -20,7 +20,7 @@
 from ubuntu_system_tests.helpers.ubuntuuitools.cpo.qquicklistview import QQuickListView  # NOQA
 from ubuntu_system_tests.helpers.ubuntuuitools.cpo.common import CustomProxyObjectBase  # NOQA
 
-INDICATOR_PAGE_PATH = b'IndicatorPage'
+INDICATOR_PAGE_PATH = b'PanelMenuPage'
 
 
 class IndicatorPage(CustomProxyObjectBase):

=== modified file 'ubuntu_system_tests/helpers/indicators/datetime.py'
--- ubuntu_system_tests/helpers/indicators/datetime.py	2016-12-19 18:50:17 +0000
+++ ubuntu_system_tests/helpers/indicators/datetime.py	2017-03-30 19:25:29 +0000
@@ -27,6 +27,7 @@
     """Autopilot helper for the date time indicator page."""
 
     name = 'indicator-datetime'
+    title = 'Time & Date'
 
     @classmethod
     def validate_dbus_object(cls, path, state):

=== modified file 'ubuntu_system_tests/helpers/indicators/indicators.py'
--- ubuntu_system_tests/helpers/indicators/indicators.py	2016-12-19 18:50:17 +0000
+++ ubuntu_system_tests/helpers/indicators/indicators.py	2017-03-30 19:25:29 +0000
@@ -16,9 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from autopilot.exceptions import StateNotFoundError
 from ubuntu_system_tests.helpers import context
-from autopilot import input
-
 from ubuntu_system_tests.helpers.input_manager import input_manager
 
 TRANSFER_INDICATOR = 'indicator-transfer'
@@ -27,16 +26,30 @@
 class IndicatorsFactory:
 
     @staticmethod
-    def get_indicators_page(indicator_name):
-        widget = context.shared.unity.main_window._get_indicator_panel_item(
-            indicator_name)
-        start_x, start_y = input.get_center_point(widget)
-        end_x = start_x
-        end_y = context.shared.unity.main_window.height
+    def get_indicators_page(name):
+        date_time_indicator = context.shared.unity.main_window.select_single(
+            objectName='indicator-datetime-panelItem')
+        x, y, w, h = date_time_indicator.get_properties()['globalRect']
+
         input_manager.pointer.drag(
-            start_x, start_y, end_x, end_y)
-        context.shared.unity.main_window.wait_select_single(
-            'IndicatorsMenu', fullyOpened=True)
+            x + w / 2, y + h / 2, x + w / 2,
+            context.shared.unity.main_window.get_properties()['height'] / 2)
+
+        indicators_list = context.shared.unity.main_window.wait_select_single(
+            objectName='indicatorsContentListView', visible=True, enabled=True)
+
+        while not indicators_list.get_properties()['atXBeginning']:
+            input_manager.keyboard.press_and_release('LEFT')
+
+        while not indicators_list.get_properties()['atXEnd']:
+            try:
+                indicators_list.select_single(
+                    objectName='{}-page'.format(name),
+                    visible=True,
+                    enabled=True)
+                break
+            except StateNotFoundError:
+                input_manager.keyboard.press_and_release('RIGHT')
 
         return context.shared.unity.main_window.select_single(
-            'IndicatorPage', visible=True)
+            'PanelMenuPage', visible=True)

=== modified file 'ubuntu_system_tests/helpers/indicators/network/cpo.py'
--- ubuntu_system_tests/helpers/indicators/network/cpo.py	2017-01-16 12:41:26 +0000
+++ ubuntu_system_tests/helpers/indicators/network/cpo.py	2017-03-30 19:25:29 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
+from ubuntu_system_tests.helpers import platform
 from ubuntu_system_tests.helpers.indicators.cpo import (
     IndicatorPage, INDICATOR_PAGE_PATH)
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
@@ -86,18 +86,24 @@
         if self.is_wifi_enabled():
             self._get_wifi_switch().toggle()
 
-    def _get_cellular_settings_menu_item(self):
+    def _get_ethernet_settings_menu_item(self):
         """Return the menu item which opens cellular settings."""
         return self.select_single(
-            objectName='indicator.cellular.settings', visible=True)
-
-    def is_cellular_settings_visible(self):
-        return self._get_cellular_settings_menu_item().visible
-
-    def open_cellular_settings(self):
+            objectName='indicator.ethernet.settings', visible=True)
+
+    def is_ethernet_settings_visible(self):
+        return self._get_ethernet_settings_menu_item().visible
+
+    def open_network_settings(self):
+        if platform.get_device_name() is 'desktop':
+            self.open_ethernet_settings()
+        else:
+            self.open_wifi_settings()
+
+    def open_ethernet_settings(self):
         """Tap the cellular settings list item to open settings."""
         input_manager.pointer.click_object(
-            self._get_cellular_settings_menu_item())
+            self._get_ethernet_settings_menu_item())
 
     def _get_wifi_settings_menu_item(self):
         """Return the menu item which opens WiFi settings."""

=== modified file 'ubuntu_system_tests/helpers/music/__init__.py'
--- ubuntu_system_tests/helpers/music/__init__.py	2016-08-24 13:41:23 +0000
+++ ubuntu_system_tests/helpers/music/__init__.py	2017-03-30 19:25:29 +0000
@@ -22,16 +22,13 @@
     APP_ID,
     APP_WIN_ID,
     CONFIG_FILE,
-    get_music_app_proxy,
-    is_music_app_running,
-    launch_music_app,
+    MusicPlayer,
     QML,
-    stop_music_app,
 )
 from ubuntu_system_tests.helpers.music.utils import (
     get_current_album,
     get_current_song,
-    set_welcome_wizard,
+    set_welcome_wizard
 )
 
 
@@ -43,10 +40,7 @@
     'CONFIG_FILE',
     'get_current_album',
     'get_current_song',
-    'get_music_app_proxy',
-    'is_music_app_running',
-    'launch_music_app',
     'QML',
     'set_welcome_wizard',
-    'stop_music_app',
+    'MusicPlayer'
 ]

=== modified file 'ubuntu_system_tests/helpers/music/app.py'
--- ubuntu_system_tests/helpers/music/app.py	2016-12-01 20:46:16 +0000
+++ ubuntu_system_tests/helpers/music/app.py	2017-03-30 19:25:29 +0000
@@ -18,12 +18,8 @@
 
 import os
 
-from ubuntu_system_tests.helpers import autopilot
 from ubuntu_system_tests.helpers import processes
-from ubuntu_system_tests.helpers.scopes.apps import (
-    launch_application_from_apps_scope
-)
-from ubuntu_system_tests.helpers import wait_until
+from ubuntu_system_tests.helpers.application import Application
 from ubuntu_system_tests.helpers import file_system as fs
 
 APP = 'music-app'
@@ -35,35 +31,25 @@
 CONFIG_FILE = os.path.join(fs.DIR_HOME_MUSIC_CONFIG, '{}.conf'.format(APP_ID))
 
 
-def launch_music_app():
-    """
-    Launch the music app from apps scope and return proxy object.
-
-    :return: Proxy object for music application.
-
-    """
-    launch_application_from_apps_scope(APP_NAME)
-    wait_until(is_music_app_running, period=0.5)
-    return get_music_app_proxy()
-
-
-def is_music_app_running():
-    """ Indicate if the music app is currently running """
-    return processes.is_qmlscene_running_with_qmlfile(APP)
-
-
-def get_music_app_proxy():
-    """
-    Return music app proxy object from existing process.
-
-    :return: Proxy object for music application.
-
-    """
-    from ubuntu_system_tests.helpers.music import cpo  # NOQA
-    proxy = autopilot.get_proxy_object(processes.get_qmlscene_process_id(APP))
-    return proxy.main_view
-
-
-def stop_music_app():
-    """ Stop the music app qml process """
-    processes.stop_qmlscene_process(QML)
+class MusicPlayer(Application):
+
+    def __init__(self):
+        super().__init__(APP_NAME, APP_ID)
+
+    def is_running(self):
+        """ Indicate if the music app is currently running """
+        return processes.is_qmlscene_running_with_qmlfile(APP)
+
+    def get_main_view(self):
+        """
+        Return music app proxy object from existing process.
+        :return: Proxy object for music application.
+        """
+        from ubuntu_system_tests.helpers.music import cpo  # NOQA
+        proxy = self.get_proxy_object()
+        return proxy.main_view
+
+    @staticmethod
+    def stop():
+        """ Stop the music app qml process """
+        processes.stop_qmlscene_process(QML)

=== modified file 'ubuntu_system_tests/helpers/ofono/utils.py'
--- ubuntu_system_tests/helpers/ofono/utils.py	2016-12-07 14:15:04 +0000
+++ ubuntu_system_tests/helpers/ofono/utils.py	2017-03-30 19:25:29 +0000
@@ -228,11 +228,14 @@
     if no slot is specified then if a SIM is inserted in
     any slot, otherwise False
     """
-    bus = dbus.SystemBus()
-    for ril_modem, properties in _get_all_modems(bus):
-        if _sim_present(bus, ril_modem, properties,
-                        sim_number, ignore_phonesim):
-            return True
+    # Since phone is not really target so far, we defaul he return value to
+    # False
+    #
+    # bus = dbus.SystemBus()
+    # for ril_modem, properties in _get_all_modems(bus):
+    #     if _sim_present(bus, ril_modem, properties,
+    #                     sim_number, ignore_phonesim):
+    #         return True
     return False
 
 

=== modified file 'ubuntu_system_tests/tests/base.py'
--- ubuntu_system_tests/tests/base.py	2017-03-23 08:50:42 +0000
+++ ubuntu_system_tests/tests/base.py	2017-03-30 19:25:29 +0000
@@ -56,7 +56,6 @@
 from ubuntu_system_tests.helpers.unity8.utils import (
     disable_settings_wizard,
     disable_edges_intro,
-    setup_unity
 )
 
 from ubuntu_system_tests.tests.data.definitions import DESKTOP_PLATFORM_NAME
@@ -87,7 +86,7 @@
     def setUp(self, custom_fixtures=[]):
         super().setUp()
         self.addCleanup(ensure_all_apps_closed)
-        self.addCleanup(setup_unity)
+        # self.addCleanup(setup_unity)
         self._reset_autopilot_registry()
         self._init_shared_context()
         if len(custom_fixtures) == 0:

=== modified file 'ubuntu_system_tests/tests/indicators/base.py'
--- ubuntu_system_tests/tests/indicators/base.py	2016-11-16 12:37:32 +0000
+++ ubuntu_system_tests/tests/indicators/base.py	2017-03-30 19:25:29 +0000
@@ -22,7 +22,6 @@
 
 
 class IndicatorTestCaseBase(base.BaseUbuntuSystemTestCase):
-    def setUp(self, indicator):
+    def setUp(self, name):
         super().setUp()
-        self.indicator_page = IndicatorsFactory.get_indicators_page(indicator)
-        self.addCleanup(self.shell.close_indicator_page)
+        self.indicator_page = IndicatorsFactory.get_indicators_page(name)

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2016-11-16 12:34:58 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2017-03-30 19:25:29 +0000
@@ -17,9 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from testtools import skipUnless
-from ubuntu_system_tests.helpers.bluetooth import is_bluetooth_supported
-
 from ubuntu_system_tests.helpers import system_settings
 from ubuntu_system_tests.helpers.indicators.bluetooth import (
     BluetoothIndicatorPage)
@@ -31,7 +28,6 @@
 
 class BluetoothIndicatorTestCase(base.IndicatorTestCaseBase):
 
-    @skipUnless(is_bluetooth_supported(), 'Bluetooth support required.')
     def setUp(self):
         super().setUp(BluetoothIndicatorPage.name)
 

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_network.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_network.py	2016-12-02 15:06:23 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_network.py	2017-03-30 19:25:29 +0000
@@ -16,166 +16,32 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals
-from testtools import skipUnless
+from ubuntu_system_tests.helpers import platform
 from ubuntu_system_tests.helpers.indicators.network.cpo import (
     NetworkIndicatorPage)
 
-from ubuntu_system_tests.helpers import (
-    radio_killswitch,
-    network,
-)
-from ubuntu_system_tests.helpers.ofono.fixture_setup import UnlockSims
-from ubuntu_system_tests.helpers.ofono.utils import (
-    wait_for_all_sims_registered, is_sim_inserted, get_sim_name)
-from ubuntu_system_tests.helpers.platform import is_wifi_supported
-
 from ubuntu_system_tests.helpers import system_settings
 from ubuntu_system_tests.tests.indicators import base
 
-
 CELLULAR_SETTINGS_PAGE = 'cellularPage'
 WIFI_SETTINGS_PAGE = 'wifiPage'
 
 
-class FlightModeTestCase(base.IndicatorTestCaseBase):
-
-    @skipUnless(is_sim_inserted() and is_wifi_supported(),
-                'SIM and Wi-Fi support required.')
-    def setUp(self):
-        self.assertTrue(wait_for_all_sims_registered())
-        self.radio_killswitch = self.useFixture(
-            radio_killswitch.RadioKillswitch(False))
-        super().setUp(NetworkIndicatorPage.name)
-
-    def assert_network_indicator_shows_flightmode_off(self,
-                                                      network_indicator_page):
-        """Network indicator UI elements reflect 'off' state of flight mode."""
-        self.assertTrue(network_indicator_page.is_flight_mode_switch_visible())
-        self.assertThat(network_indicator_page.is_sim_list_offline,
-                        Eventually(Equals(False)))
-        self.assertTrue(network_indicator_page.is_wifi_switch_visible())
-        self.assertThat(network_indicator_page.is_wifi_enabled,
-                        Eventually(Equals(True)))
-        self.assertThat(network_indicator_page.get_list_of_wifi_access_points,
-                        Eventually(NotEquals([])))
-        self.assertTrue(network_indicator_page.is_cellular_settings_visible())
-        self.assertTrue(network_indicator_page.is_wifi_settings_visible())
-
-    def assert_network_indicator_shows_flightmode_on(self,
-                                                     network_indicator_page):
-        """Network indicator UI elements reflect 'on' state of flight mode."""
-        self.assertThat(network_indicator_page.is_sim_list_offline,
-                        Eventually(Equals(True)))
-        self.assertThat(network_indicator_page.is_wifi_enabled,
-                        Eventually(Equals(False)))
-        self.assertThat(
-            network_indicator_page.get_list_of_wifi_access_points,
-            Eventually(Equals([])))
-
-    def test_switching_on_flight_mode_must_engage_flight_mode(self):
-        """Switching on 'flight mode' in the indicator must engage flight mode.
-
-        Note that we assume we're starting in *off* mode; also we skip
-        the test if no SIM is inserted.
-
-        """
-        self.assertFalse(self.radio_killswitch.is_flight_mode_on(),
-                         'Test must be run with flight mode off.')
-        self.assert_network_indicator_shows_flightmode_off(
-            self.indicator_page)
-        self.indicator_page.turn_on_flight_mode()
-        self.assertThat(self.radio_killswitch.is_flight_mode_on,
-                        Eventually(Equals(True)))
-        self.assert_network_indicator_shows_flightmode_on(
-            self.indicator_page)
-        self.indicator_page.turn_off_flight_mode()
-        self.assertThat(self.radio_killswitch.is_flight_mode_on,
-                        Eventually(Equals(False)))
-        self.assert_network_indicator_shows_flightmode_off(
-            self.indicator_page)
-
-    def assert_network_indicator_shows_wifi_enabled_flight_mode_on(
-            self, network_indicator_page):
-        self.assertThat(network_indicator_page.is_sim_list_offline,
-                        Eventually(Equals(True)))
-        self.assertThat(network_indicator_page.is_wifi_enabled,
-                        Eventually(Equals(True)))
-        self.assertThat(
-            network_indicator_page.get_list_of_wifi_access_points,
-            Eventually(NotEquals([])))
-
-    def test_enable_wifi_in_flight_mode(self):
-        """
-        Enable flight mode and turn on wifi and check internet is working
-
-        1. Switch to flight mode
-        2. Turn on Wifi
-        3. Ensure internet is working
-        """
-        self.assertFalse(self.radio_killswitch.is_flight_mode_on(),
-                         'Test must be run with flight mode off.')
-        self.assert_network_indicator_shows_flightmode_off(
-            self.indicator_page)
-        self.indicator_page.turn_on_flight_mode()
-        self.addCleanup(self.indicator_page.turn_off_flight_mode)
-        self.assertThat(self.radio_killswitch.is_flight_mode_on,
-                        Eventually(Equals(True)))
-        self.assert_network_indicator_shows_flightmode_on(
-            self.indicator_page)
-        self.indicator_page.turn_on_wifi()
-        self.assert_network_indicator_shows_wifi_enabled_flight_mode_on(
-            self.indicator_page)
-        network.ensure_internet_connectivity(timeout=15)
-
-
-class CellularProvidersTestCase(base.IndicatorTestCaseBase):
-
-    @skipUnless(is_sim_inserted(), 'At least one SIM card required')
-    def setUp(self):
-        self.assertTrue(wait_for_all_sims_registered())
-        self.useFixture(UnlockSims())
-        super().setUp(NetworkIndicatorPage.name)
-
-    def test_cellular_providers_register(self):
-        """
-        Prerequisite: At least one SIM is inserted into the phone.
-        1. Drag down the network indicator
-           - The network menu opens and shows the currently
-             active SIMs names.
-        """
-        sims = self.indicator_page.get_list_of_sims()
-        for index, sim in enumerate(sims):
-            self.assertEqual(sim.get_sim_name(), get_sim_name(index))
-
-
 class NetworkIndicatorTestCase(base.IndicatorTestCaseBase):
 
     def setUp(self):
         super().setUp(NetworkIndicatorPage.name)
 
-    def test_cellular_settings_item_open_correct_page(self):
+    def test_ethernet_settings_item_open_correct_page(self):
         """
         1. Drag down the network indicator
         2. Tap 'Cellular settings...'
         3. Ensure cellular settings open
         """
-        self.indicator_page.open_cellular_settings()
-        settings_app = system_settings.get_system_settings_proxy()
-        system_settings.ensure_settings_page_visible(settings_app,
-                                                     CELLULAR_SETTINGS_PAGE)
-
-    @skipUnless(is_wifi_supported(),
-                'Wi-Fi support required.')
-    def test_wifi_settings_item_open_correct_page(self):
-        """
-        1. Drag down the network indicator
-        2. Tap 'Wifi settings...'
-        3. Ensure Wifi settings open
-        """
-        self.indicator_page.open_wifi_settings()
-        settings_app = system_settings.get_system_settings_proxy()
-        system_settings.ensure_settings_page_visible(settings_app,
-                                                     WIFI_SETTINGS_PAGE)
+        self.indicator_page.open_network_settings()
+        settings_app = system_settings.get_system_settings_proxy()
+        expected_page = WIFI_SETTINGS_PAGE if \
+            platform.get_device_name() is not 'desktop' \
+            else CELLULAR_SETTINGS_PAGE
+        system_settings.ensure_settings_page_visible(settings_app,
+                                                     expected_page)

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_sound.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2016-12-02 18:49:50 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2017-03-30 19:25:29 +0000
@@ -17,16 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
+import os
 import shutil
 
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
+from ubuntu_system_tests.helpers.music.app import MusicPlayer
 from ubuntu_system_tests.helpers.unity8.utils import close_all_apps
 from ubuntu_system_tests.helpers.indicators.sound import SoundIndicatorPage
 from ubuntu_system_tests.helpers import media
-from ubuntu_system_tests.helpers import music
 from ubuntu_system_tests.helpers import system_settings
 from ubuntu_system_tests.helpers.indicators.indicators import IndicatorsFactory
 from ubuntu_system_tests.helpers.music import fixture_setup as music_fixture
@@ -34,6 +34,7 @@
 from ubuntu_system_tests.tests.indicators import base
 from ubuntu_system_tests.tests import data as test_data
 
+from ubuntu_system_tests.helpers import file_system as fs
 
 SOUND_SETTINGS_PAGE = 'soundPage'
 
@@ -61,9 +62,16 @@
         super().setUp()
         self.useFixture(media.BackupRestoreLocalMediaFixture())
         self.useFixture(music_fixture.MusicAppWelcomeWizard(show_wizard=True))
+
+        if not os.path.exists(fs.DIR_HOME_MUSIC):
+            os.makedirs(fs.DIR_HOME_MUSIC)
         shutil.copy2(test_data.SRC_AUDIO_FILE_2, test_data.LOCAL_AUDIO_FILE_2)
         shutil.copy2(test_data.SRC_AUDIO_FILE_4, test_data.LOCAL_AUDIO_FILE_4)
-        self.music_app = music.launch_music_app()
+
+        music_player = MusicPlayer()
+        music_player.launch_from_app_drawer()
+
+        self.music_app = music_player.get_main_view()
         self.music_app.ensure_walkthrough_page_not_visible()
 
     def test_play_pause_track_from_indicator(self):