Merge pull request #30520 from mwargers/1172460_2

Bug 1172460 - Intermittent failure in test_sms_notification_removed_when_sms_deleted.py in wait_for_notification_toaster_displayed
mozilla-b2g · Jun 21, 2015 · a20a867 · a20a867
2 parents 77dd6b9 + 782d160
commit a20a867
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/tests/atoms/gaia_data_layer.js b/tests/atoms/gaia_data_layer.js
@@ -495,13 +495,17 @@ var GaiaDataLayer = {
     };
   },
 
-  sendSMS: function(recipient, content, aCallback) {
+  sendSMS: function(recipient, content, skipVerification, aCallback) {
     // requires the 'sms' permission and the 'dom.sms.enabled' pref
     var callback = aCallback || marionetteScriptFinished;
     console.log('sending sms message to number: ' + recipient);
 
     let messageManager = window.navigator.mozMobileMessage;
     let request = messageManager.send(recipient, content);
+    if (skipVerification) {
+      marionetteScriptFinished(true);
+      return;
+    }
 
     request.onsuccess = function(event) {
       var sms = event.target.result;

diff --git a/tests/python/gaia-ui-tests/gaiatest/gaia_test.py b/tests/python/gaia-ui-tests/gaiatest/gaia_test.py
@@ -494,15 +494,15 @@ def sdcard_files(self, extension=''):
             return [file for file in files if file['name'].endswith(extension)]
         return files
 
-    def send_sms(self, number, message):
+    def send_sms(self, number, message, skip_verification=False):
         self.marionette.switch_to_frame()
         import json
         number = json.dumps(number)
         message = json.dumps(message)
 
         self.marionette.push_permission('sms', True)
         self.set_bool_pref('dom.sms.enabled', True)
-        result = self.marionette.execute_async_script('return GaiaDataLayer.sendSMS(%s, %s)' % (number, message))
+        result = self.marionette.execute_async_script('return GaiaDataLayer.sendSMS(%s, %s, %s)' % (number, message, str(skip_verification).lower()))
         self.marionette.push_permission('sms', False)
         self.clear_user_pref('dom.sms.enabled')
 

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/test_sms_notification.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/test_sms_notification.py
@@ -19,7 +19,7 @@ def test_sms_notification(self):
         system = System(self.marionette)
 
         # Send a SMS to the device
-        self.data_layer.send_sms(self.environment.phone_numbers[0], _text_message_content)
+        self.data_layer.send_sms(self.environment.phone_numbers[0], _text_message_content, skip_verification=True)
 
         # We will wait upto 300 seconds for the SMS to arrive due to network latency
         system.wait_for_notification_toaster_displayed(timeout=300,

diff --git a/...ests/gaiatest/tests/functional/messages/test_sms_notification_removed_when_sms_deleted.py b/...ests/gaiatest/tests/functional/messages/test_sms_notification_removed_when_sms_deleted.py
@@ -25,7 +25,7 @@ def test_sms_notification_removed_when_sms_deleted(self):
         messages.launch()
 
         # Send a SMS to the device
-        self.data_layer.send_sms(self.environment.phone_numbers[0], _text_message_content)
+        self.data_layer.send_sms(self.environment.phone_numbers[0], _text_message_content, skip_verification=True)
 
         system = System(self.marionette)