Merge lp:~fazerlicourice/music-app/test-empty-library into lp:music-app

[Vamshi Balanaga]

* Add test to make sure that the LibraryEmptyState page is visible when no music is detected on the device.

Created a test to check if the LibraryEmptyState page is displayed when no music is detected in the target directory.

[Nicholas Skaggs (nskaggs)]

In addition to the comments below, does this pass pep8?

[Nicholas Skaggs (nskaggs)]

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

So add the removal code, and this is a +1 from me. Good work!

[Andrew Hayzen (ahayzen)]

Looking good so far, a few inline comments, I haven't run the code yet these are just observations :-)

Also the code should pass PEP8 and pyflakes, see the link [0] for the current errors.

And could you add an entry for yourself in the debian/changelog (simply run $ dch) and link bug 1261587 as has been done in other entries.

0 - http://pastebin.ubuntu.com/14082325/

review: Needs Fixing

[Victor Thompson (vthompson)]

I don't think we should be setting the schema version of mediascanner2 back to version 9. If it is perhaps an issue for developers/testers not running the development release, then we need to add instructions on how to install the newest release of mediascanner2 that is on the phone. Likewise, I think the other changes to the mediastore.db file should be reverted.

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

It now passes pep8 and snowflake tests and I have added an entry for me in debian/changelog.

[Vamshi Balanaga (fazerlicourice)]

If I attempt to edit any of the .sql files, when I try to read them and convert them to .db, it doesn't work. The current .db files are from nskaggs' patch. I was unable to get the sql stuff to work. I get the error- 'no such table: schemaVersion' just like I was getting earlier. If I revert back to the patch that nskaggs had provided, they all work, but if I make any changes and then attempt to read them with "sqlite3 mediastore.db < mediastore.sql" it doesn't work.

[Nicholas Skaggs (nskaggs)]

Victor, ohh you DO want schema 10? I needed it locally, but for some reason, I thought you wanted schema 9. The changes to mediastore.db should be easy enough to revert if you don't like / want them.

Vamshi, The new files are in tests/autopilot/music_app/content/blank-mediascanner-2.0. You don't need to touch them and they are fine. I repeat, you don't need to create any database files, so don't worry about that.

From reading the comments I would:

1) Update the insert schema version to 10 in the sql files
2) Checkout the older revision of tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db and replace it so there is no diff with this MP.

[Nicholas Skaggs (nskaggs)]

One additional comment on how you are removing files.

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

Like I said earlier, when I try to edit the sql files, the tests fail regardless of whether or not I had sqlite3 read them and convert to .db. Initially I'll get an error that says incomplete sql, this is because there is no semi-colon at the end of the line. After I add the semi-colon, it says no such table schemaVersion.

[Vamshi Balanaga (fazerlicourice)]

I changed the schemaVersion to 10 and I changed the file removal parameter. The tests no longer work for me because its schemaVersion 10 but Nicholas informed me that its right.

[Andrew Hayzen (ahayzen)]

Some more inline comments :-)

1) I don't think you need to add the visible: false as the object is created when it is required.
2) I wonder if this method should be get_library_empty_state() or get_library_empty_state_page() ? To match the pattern of the other methods?
3) Can the double space be fixed to a single space?
4) This import can be removed, see further details below.
5) If the first os.remove() fails, then this throws the exception before it can attempt to remove the others?
6) Change this to
except Exception as e:
    logger.debug("Mediscanner patching failed %s" % e)

Or for exactly the same
except Exception as e:
    logger.debug("Mediscanner patching failed %s" % type(e))

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

Andrew, I made those changes and pushed.

[Victor Thompson (vthompson)]

When I run these tests on the device or when run on the desktop, each test produces the "No music found" view. Here is the output on the desktop: http://paste.ubuntu.com/14123722/

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

The error is "Could not initialise media store: Tried to open a db with schema version 9, while supported version is 10."

bzr thinks that the mediastore.db has been modified, so what changes have been made to that?

=== modified file 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db'
Binary files tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db 2015-11-01 16:17:33 +0000 and tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db 2015-12-20 00:11:18 +0000 differ

[Vamshi Balanaga (fazerlicourice)]

I didn't make any changes to the .db files. All I did was change the
schemaVersion in the .sql files to 10. I tried converting those .sql files
to .db files but I got some errors and when I told Nicholas he said that I
don't need to do that, and that I should leave the .db files as they are.

Vamshi Balanaga

On Mon, Dec 21, 2015 at 7:21 AM, Andrew Hayzen <email address hidden> wrote:

> The error is "Could not initialise media store: Tried to open a db with
> schema version 9, while supported version is 10."
>
> bzr thinks that the mediastore.db has been modified, so what changes have
> been made to that?
>
> === modified file
> 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db'
> Binary files
> tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db 2015-11-01
> 16:17:33 +0000 and
> tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db 2015-12-20
> 00:11:18 +0000 differ
> --
>
> https://code.launchpad.net/~vamrocks602/music-app/test-empty-library/+merge/280794
> You are the owner of lp:~vamrocks602/music-app/test-empty-library.
>

[Victor Thompson (vthompson)]

Vamshi,

It seems that the test you added is failing: http://paste.ubuntu.com/14134202/

Should "get_LibraryEmptyState" actually be "get_library_empty_state_page" or something else perhaps?

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

I apologize for that, I thought that I changed that. It's done now, just
pushed.

[Victor Thompson (vthompson)]

Vamshi,

The test still does not work. Here's the log output--I believe you need to ad "_page" to the method call.

test-log: {{{
18:34:56.811 INFO logging:45 - TestEmptyLibrary: launch_test_local. Arguments (). Keyword arguments: {}.
18:34:56.811 WARNING base:52 - This function is deprecated. Use get_toolkit_launcher_command() instead.
18:34:56.811 INFO _launcher:392 - Attempting to launch application '/usr/lib/x86_64-linux-gnu/qt5/bin/qmlscene' with arguments '/home/victor/Development/test-empty-library/app/music-app.qml debug' as a normal process
18:34:56.821 INFO _launcher:450 - Launching process: ['/usr/lib/x86_64-linux-gnu/qt5/bin/qmlscene', '-testability', '/home/victor/Development/test-empty-library/app/music-app.qml', 'debug']
18:35:00.423 INFO _launcher:563 - waiting for process to exit.
18:35:00.423 INFO _launcher:586 - Killing process 36773
18:35:00.531 WARNING content:83 - Followed stream is empty.
}}}

Traceback (most recent call last):
  File "/home/victor/Development/test-empty-library/tests/autopilot/music_app/tests/test_music.py", line 32, in test_display_message_when_no_music
    library = self.app.get_library_empty_state()
AttributeError: 'MusicApp' object has no attribute 'get_library_empty_state'

Ran 20 tests in 253.585s
FAILED (failures=1)

review: Needs Fixing

[Victor Thompson (vthompson)]

Also, you'll need to resolve the merge conflict in the debian/changelog file. We get such conflicts frequently as multiple people work to propose merges.

To fix, do the following:

$ bzr merge lp:music-app

Then, fix the conflict in the debian/changelog and save it. Then run:

$ bzr resolve debian/changelog

From there just commit and push the changes as usual.

[Victor Thompson (vthompson)]

Lastly, when I run this on the device I get the "No music found" page consistently. I imagine there might be something in the change to how we do mocking that might have caused it.

ahazyen, balloons: Can you guys work with Vamshi to fix this issue?

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

I fixed the method name, and resolved the conflict.

Vamshi Balanaga

On Tue, Dec 22, 2015 at 8:09 PM, Victor Thompson <email address hidden>
wrote:

> Review: Needs Fixing
>
> Lastly, when I run this on the device I get the "No music found" page
> consistently. I imagine there might be something in the change to how we do
> mocking that might have caused it.
>
> ahazyen, balloons: Can you guys work with Vamshi to fix this issue?
> --
>
> https://code.launchpad.net/~vamrocks602/music-app/test-empty-library/+merge/280794
> You are the owner of lp:~vamrocks602/music-app/test-empty-library.
>

[Victor Thompson (vthompson)]

Thanks Vamshi.

We still need input/verification on the device tests. I won't have the time to help you with this in the near term.

[Vamshi Balanaga (fazerlicourice)]

By verification, do you mean you have to see if it works? Or do know that it doesn't work and you need to see what's wrong?

[Nicholas Skaggs (nskaggs)]

Hey Vamshi! I've asked Andrew to do 2 things.

1) Test this out so we can merge it :-)
2) Add some more autopilot tasks to GCI so you can have some more fun.

Thanks again for working on this and sorry for the delay in verifying.

[Vamshi Balanaga (fazerlicourice)]

Thank you very much.

[Andrew Hayzen (ahayzen)]

OK this is erroring still due to
[Errno 2] No such file or directory: '/tmp/adt-run.XH20gO/tree/tests/autopilot/music_app/content/blank-mediascanner-2.0/songs/1.ogg'
[Errno 2] No such file or directory: '/tmp/adt-run.XH20gO/tree/tests/autopilot/music_app/content/blank-mediascanner-2.0/songs/2.ogg'
[Errno 2] No such file or directory: '/tmp/adt-run.XH20gO/tree/tests/autopilot/music_app/content/blank-mediascanner-2.0/songs/3.mp3'

However it was silently failing, so we didn't know it was unable to remove the files, full log with my extra debugging can be found here [0]

There are two inline comments (3 instances of each) to fix, which should resolve this
1) This should be
os.remove(os.path.join(musicpath, '1.ogg'))
2) As these were failing silently, can we change these to
except OSError as e:
    logger.debug("Error removing" + str(e))

Once you have fixed those issues, the test passes for me :-) My diff looks like this [1]

0 - http://pastebin.ubuntu.com/14404744/
1 - http://pastebin.ubuntu.com/14404783/

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

Made the changes and pushed.

[Andrew Hayzen (ahayzen)]

LGTM! Thanks for your patience and time spent on this :-)

Took me 4 runs but I eventually got

test autopilot: - - - - - - - - - - results - - - - - - - - - -
autopilot PASS

\o/

For the other 3 runs I had test_shuffle (once) and test_pressing_prev_from_first_song_plays_last_when_repeat_on (twice) fail looks like they are possibly flaky tests, hopefully test_shuffle will be improved after the bgplaylists, or just because I'm running custom versions of qtubuntu-media.

review: Approve

[Victor Thompson (vthompson)]

Running from the deksopt:

Tests running...

Ran 20 tests in 392.937s
OK

We can try to fix the flakiness of the tests at a later time--as it wouldn't have been introduced under this change.

Thanks! lgtm!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1393/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/9/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1394/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'AUTHORS'
--- AUTHORS	2015-09-08 08:12:31 +0000
+++ AUTHORS	2016-01-04 23:02:20 +0000
@@ -37,5 +37,6 @@
 Stefano Verzegnassi <[e-mail]>
 Ted Gould <[e-mail]>
 Tim Peeters <[e-mail]>
+Vamshi Balanaga <[e-mail]>
 Víctor R. Ruiz <[e-mail]>
 Victor Thompson <[e-mail]>
 
=== modified file 'app/ui/LibraryEmptyState.qml'
--- app/ui/LibraryEmptyState.qml	2015-10-28 01:05:33 +0000
+++ app/ui/LibraryEmptyState.qml	2016-01-04 23:02:20 +0000
@@ -22,6 +22,7 @@
 
 Page {
     id: libraryEmptyPage
+    objectName: "emptyLibrary"
     anchors {
         fill: parent
     }
@@ -32,6 +33,11 @@
         locked: true
     }
 
+    // Hack for autopilot otherwise LibraryEmptyState appears as Page
+    // due to bug 1341671 it is required that there is a property so that
+    // qml doesn't optimise using the parent type
+    property bool bug1341671workaround: true
+
     // Overlay to show when no tracks detected on the device
     Rectangle {
         id: libraryEmpty
@@ -105,6 +111,7 @@
 
             Label {
                 color: styleMusic.libraryEmpty.labelColor
+                objectName: "titleText"
                 elide: Text.ElideRight
                 fontSize: "x-large"
                 horizontalAlignment: Text.AlignLeft
@@ -116,6 +123,7 @@
 
             Label {
                 color: styleMusic.libraryEmpty.labelColor
+                objectName:"descriptiveText"
                 elide: Text.ElideRight
                 fontSize: "large"
                 horizontalAlignment: Text.AlignLeft
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-17 20:43:26 +0000
+++ debian/changelog	2016-01-04 23:02:20 +0000
@@ -1,11 +1,14 @@
 music-app (2.3) UNRELEASED; urgency=medium
-
+  
   [ Andrew Hayzen ]
   * Release 2.2ubuntu2 and start on 2.3
 
   [ Ken VanDine ]
   * Install the content-hub json file in the correct place for peer registry
 
+  [ Vamshi Balanaga ]
+  * Add test to make sure that the LibraryEmptyState page is visible when no audio is  detected on the device (LP: #1261587).
+
   [ Girish Rawat ]
   * Expanded and updated READMEs
 
 
=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2015-11-03 03:55:07 +0000
+++ tests/autopilot/music_app/__init__.py	2016-01-04 23:02:20 +0000
@@ -135,6 +135,16 @@
         # wait for now playing page to be visible
         self.get_now_playing_page().visible.wait_for(True)
 
+    def get_library_empty_state_page(self):
+        return self.app.wait_select_single(LibraryEmptyState,
+                                           objectName="emptyLibrary")
+
+
+class LibraryEmptyState(UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for LibraryEmptyState"""
+    def __init__(self, *args):
+        super(LibraryEmptyState, self).__init__(*args)
+
 
 class Page(UbuntuUIToolkitCustomProxyObjectBase):
     """Autopilot helper for Pages."""
@@ -335,8 +345,8 @@
     @click_object
     def click_artist(self, i):
         return self.wait_select_single("Card",
-                                       objectName="albumsPageGridItem"
-                                       + str(i))
+                                       objectName="albumsPageGridItem" +
+                                       str(i))
 
     def get_artist(self):
         return self.wait_select_single("UCLabel",
 
=== added directory 'tests/autopilot/music_app/content/blank-mediascanner-2.0'
=== added file 'tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.db'
 Binary files tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.db	1970-01-01 00:00:00 +0000 and tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.db	2016-01-04 23:02:20 +0000 differ
=== added file 'tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.sql'
--- tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.sql	1970-01-01 00:00:00 +0000
+++ tests/autopilot/music_app/content/blank-mediascanner-2.0/mediastore.sql	2016-01-04 23:02:20 +0000
@@ -0,0 +1,1 @@
+INSERT INTO schemaVersion VALUES(10)
 
=== modified file 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db'
 Binary files tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	2015-11-01 16:17:33 +0000 and tests/autopilot/music_app/content/mediascanner-2.0/mediastore.db	2016-01-04 23:02:20 +0000 differ
=== modified file 'tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sch'
--- tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sch	2015-11-03 02:43:10 +0000
+++ tests/autopilot/music_app/content/mediascanner-2.0/mediastore.sch	2016-01-04 23:02:20 +0000
@@ -27,6 +27,7 @@
 CREATE INDEX media_genre_idx ON media(type, genre) WHERE type = 1;
 CREATE INDEX media_mtime_idx ON media(type, mtime);
 CREATE TABLE media_attic (
+    id INTEGER PRIMARY KEY,
     filename TEXT UNIQUE NOT NULL,
     content_type TEXT,
     etag TEXT,
@@ -48,7 +49,7 @@
     type INTEGER   -- 0=Audio, 1=Video
 );
 CREATE VIRTUAL TABLE media_fts
-USING fts4(content='media', title, artist, album, tokenize=mozporter);
+USING fts4(content='media', title, artist, album, tokenize=porter);
 CREATE TABLE 'media_fts_segments'(blockid INTEGER PRIMARY KEY, block BLOB);
 CREATE TABLE 'media_fts_segdir'(level INTEGER,idx INTEGER,start_block INTEGER,leaves_end_block INTEGER,end_block INTEGER,root BLOB,PRIMARY KEY(level, idx));
 CREATE TABLE 'media_fts_docsize'(docid INTEGER PRIMARY KEY, size BLOB);
 
=== added directory 'tests/autopilot/music_app/content/mediascanner-2.0/songs'
=== renamed file 'tests/autopilot/music_app/content/1.ogg' => 'tests/autopilot/music_app/content/mediascanner-2.0/songs/1.ogg'
=== renamed file 'tests/autopilot/music_app/content/2.ogg' => 'tests/autopilot/music_app/content/mediascanner-2.0/songs/2.ogg'
=== renamed file 'tests/autopilot/music_app/content/3.mp3' => 'tests/autopilot/music_app/content/mediascanner-2.0/songs/3.mp3'
=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2015-02-03 14:42:34 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2016-01-04 23:02:20 +0000
@@ -35,12 +35,9 @@
 logger = logging.getLogger(__name__)
 
 
-class BaseTestCaseWithPatchedHome(AutopilotTestCase):
-
+class BaseTestClassWithPatchedHome(AutopilotTestCase):
     """A common test case class that provides several useful methods for
-    music-app tests.
-
-    """
+    music-app tests."""
 
     working_dir = os.getcwd()
     local_location_dir = os.path.dirname(os.path.dirname(working_dir))
@@ -59,12 +56,6 @@
             test_type = 'click'
         return launch, test_type
 
-    def setUp(self):
-        super(BaseTestCaseWithPatchedHome, self).setUp()
-        self.launcher, self.test_type = self.get_launcher_method_and_type()
-        self.home_dir = self._patch_home()
-        self._create_music_library()
-
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
         return self.launch_test_application(
@@ -90,8 +81,8 @@
             emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def _copy_xauthority_file(self, directory):
-        """ Copy .Xauthority file to directory, if it exists in /home
-        """
+        """ Copy .Xauthority file to directory, if it exists in /home"""
+
         # If running under xvfb, as jenkins does,
         # xsession will fail to start without xauthority file
         # Thus if the Xauthority file is in the home directory
@@ -107,8 +98,7 @@
                 os.path.join(directory, '.Xauthority'))
 
     def _patch_home(self):
-        """ mock /home for testing purposes to preserve user data
-        """
+        """ mock /home for testing purposes to preserve user data"""
 
         # if running on non-phablet device,
         # run in temp folder to avoid mucking up home
@@ -141,29 +131,47 @@
             logger.debug("Patched home to fake home directory %s" % temp_dir)
         return temp_dir
 
-    def _create_music_library(self):
+    def _create_music_library(self, db_dir):
         logger.debug("Creating music library for %s test" % self.test_type)
         logger.debug("Home set to %s" % self.home_dir)
         musicpath = os.path.join(self.home_dir, 'Music')
         logger.debug("Music path set to %s" % musicpath)
         mediascannerpath = os.path.join(self.home_dir,
                                         '.cache/mediascanner-2.0')
+        logger.debug("Mediascanner path set to %s" % mediascannerpath)
+
         if not os.path.exists(musicpath):
             os.makedirs(musicpath)
-        logger.debug("Mediascanner path set to %s" % mediascannerpath)
 
         # set content path
         content_dir = os.path.join(os.path.dirname(music_app.__file__),
-                                   'content')
-
+                                   'content', db_dir)
+        songs_dir = os.path.join(content_dir, 'songs')
         logger.debug("Content dir set to %s" % content_dir)
 
         # copy content
-        shutil.copy(os.path.join(content_dir, '1.ogg'), musicpath)
-        shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
-        shutil.copy(os.path.join(content_dir, '3.mp3'), musicpath)
-
-        logger.debug("Music copied, files " + str(os.listdir(musicpath)))
+        if os.path.isdir(songs_dir) and db_dir == 'mediascanner-2.0':
+            shutil.copy(os.path.join(songs_dir, '1.ogg'), musicpath)
+            shutil.copy(os.path.join(songs_dir, '2.ogg'), musicpath)
+            shutil.copy(os.path.join(songs_dir, '3.mp3'), musicpath)
+
+            logger.debug("Music copied, files " + str(os.listdir(musicpath)))
+        # delete content if previously copied
+        elif not os.path.isdir(songs_dir):
+            try:
+                os.remove(os.path.join(musicpath, '1.ogg'))
+            except OSError as e:
+                logger.debug("Error removing" + str(e))
+            try:
+                os.remove(os.path.join(musicpath, '2.ogg'))
+            except OSError as e:
+                logger.debug("Error removing" + str(e))
+            try:
+                os.remove(os.path.join(musicpath, '3.mp3'))
+            except OSError as e:
+                logger.debug("Error removing" + str(e))
+
+            logger.debug("Music deleted, files " + str(os.listdir(musicpath)))
 
         if self.test_type is not 'click':
             self._patch_mediascanner_home(content_dir, mediascannerpath)
@@ -172,8 +180,8 @@
         # do some inline db patching
         # patch mediaindex to proper home
         # these values are dependent upon our sampled db
-        shutil.copytree(
-            os.path.join(content_dir, 'mediascanner-2.0'), mediascannerpath)
+        shutil.copytree(content_dir, mediascannerpath)
+
         logger.debug("Patching fake mediascanner database in %s" %
                      mediascannerpath)
         logger.debug(
@@ -182,6 +190,7 @@
 
         relhome = self.home_dir[1:]
         dblocation = "home/phablet"
+
         # patch mediaindex
         self._file_find_replace(mediascannerpath +
                                 "/mediastore.sql", dblocation, relhome)
@@ -190,7 +199,12 @@
         f = open(mediascannerpath + "/mediastore.sql", 'rb')
         sql = f.read().decode("utf-8")
         cur = con.cursor()
-        cur.executescript(sql)
+        try:
+            cur.executescript(sql)
+            con.commit()
+        except Exception as e:
+            logger.debug("Mediscanner patching failed %s" % e)
+            raise
         con.close()
 
         logger.debug(
@@ -213,6 +227,28 @@
         os.rename(out_filename, in_filename)
 
 
+class BaseTestCaseWithPatchedHome(BaseTestClassWithPatchedHome):
+
+    """ Base test case class for music-app, with viable audio files loaded."""
+
+    def setUp(self):
+        super(BaseTestClassWithPatchedHome, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_method_and_type()
+        self.home_dir = self._patch_home()
+        self._create_music_library('mediascanner-2.0')
+
+
+class EmptyLibraryWithPatchedHome(BaseTestClassWithPatchedHome):
+
+    """ Base test case class for music-app with empty library. """
+
+    def setUp(self):
+        super(BaseTestClassWithPatchedHome, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_method_and_type()
+        self.home_dir = self._patch_home()
+        self._create_music_library('blank-mediascanner-2.0')
+
+
 class MusicAppTestCase(BaseTestCaseWithPatchedHome):
 
     """Base test case that launches the music-app."""
@@ -220,3 +256,13 @@
     def setUp(self):
         super(MusicAppTestCase, self).setUp()
         self.app = MusicApp(self.launcher())
+
+
+class MusicAppTestCaseEmptyLibrary(EmptyLibraryWithPatchedHome):
+
+    """Test case that launches the music-app with no music:
+    an empty library."""
+
+    def setUp(self):
+        super(MusicAppTestCaseEmptyLibrary, self).setUp()
+        self.app = MusicApp(self.launcher())
 
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2015-11-02 05:19:12 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2016-01-04 23:02:20 +0000
@@ -14,11 +14,27 @@
 from testtools.matchers import Equals, GreaterThan, LessThan, NotEquals
 
 
-from music_app.tests import MusicAppTestCase
+from music_app.tests import MusicAppTestCase, MusicAppTestCaseEmptyLibrary
 
 logger = logging.getLogger(__name__)
 
 
+class TestEmptyLibrary(MusicAppTestCaseEmptyLibrary):
+
+    def setUp(self):
+        super(TestEmptyLibrary, self).setUp()
+        self.app.get_walkthrough_page().skip()
+
+    def test_display_message_when_no_music(self):
+        """When no music is detected, the app must display a certain Page"""
+
+        # obtain the LibraryEmptyState page
+        library = self.app.get_library_empty_state_page()
+
+        # check if the correct page(LibraryEmptyState) is being shown
+        self.assertThat(library.visible, Eventually(Equals(True)))
+
+
 class TestMainWindow(MusicAppTestCase):
 
     def setUp(self):