Bug 900664 - Skip testImportFromAndroid on x86 emu; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Thu, 29 Aug 2013 16:44:26 -0600
changeset 153045 dfdb69b6dfd36d996137bc8e92ced7276d90caa6
parent 153044 c456e82b5e0765a4877b35be767a474303784bd4
child 153046 bb557a5557c2d70b2d73f2002855e70ed16870f6
push idunknown
push userunknown
push dateunknown
reviewersjmaher
bugs900664
milestone26.0a1
Bug 900664 - Skip testImportFromAndroid on x86 emu; r=jmaher
testing/mochitest/runtestsremote.py
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -617,16 +617,20 @@ def main():
 
             # If the test is for checking the import from bookmarks then make sure there is data to import
             if test['name'] == "testImportFromAndroid":
                 
                 # Get the OS so we can run the insert in the apropriate database and following the correct table schema
                 osInfo = dm.getInfo("os")
                 devOS = " ".join(osInfo['os'])
 
+                # Bug 900664: stock browser db not available on x86 emulator
+                if ("sdk_x86" in devOS):
+                    continue
+
                 if ("pandaboard" in devOS):
                     delete = ['execsu', 'sqlite3', "/data/data/com.android.browser/databases/browser2.db \'delete from bookmarks where _id > 14;\'"]
                 else:
                     delete = ['execsu', 'sqlite3', "/data/data/com.android.browser/databases/browser.db \'delete from bookmarks where _id > 14;\'"]
                 if (options.dm_trans == "sut"):
                     dm._runCmds([{"cmd": " ".join(delete)}])
 
                 # Insert the bookmarks