From dfa38a4ae01c6c51ba47da3cbe0a19fba3de29ae Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Fri, 10 Oct 2014 17:21:18 +0200
Subject: [PATCH] Bug 1073537 - Skip payload.info.revision check on
 non-official builds. r=froydnj

---
 toolkit/components/telemetry/tests/unit/test_TelemetryPing.js | 4 +++-
 toolkit/components/telemetry/tests/unit/xpcshell.ini          | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
index ad1823b4c2f5..7cc90e0d872e 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
@@ -158,7 +158,9 @@ function checkPayloadInfo(payload, reason) {
   do_check_true("appUpdateChannel" in payload.info);
   do_check_true("locale" in payload.info);
   do_check_true("revision" in payload.info);
-  do_check_true(payload.info.revision.startsWith("http"));
+  if (Services.appinfo.isOfficial) {
+    do_check_true(payload.info.revision.startsWith("http"));
+  }
 
   try {
     // If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini
index 9febf651f4eb..4ea491083def 100644
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -10,7 +10,6 @@ skip-if = toolkit == 'gonk'
 [test_TelemetryPing.js]
 # Bug 676989: test fails consistently on Android
 # fail-if = os == "android"
-fail-if = !official # This test fails in unofficial builds because the payload revision is unavailable
 [test_TelemetryPing_idle.js]
 [test_TelemetryStopwatch.js]
 [test_TelemetryPingBuildID.js]