зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 13c7176938cd (bug 1144409)
This commit is contained in:
Родитель
b27ea35c32
Коммит
5afca0859f
|
@ -664,7 +664,6 @@ var gEMETests = [
|
||||||
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
||||||
},
|
},
|
||||||
sessionType:"temporary",
|
sessionType:"temporary",
|
||||||
sessionCount:1,
|
|
||||||
duration:1.60,
|
duration:1.60,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -685,7 +684,6 @@ var gEMETests = [
|
||||||
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
||||||
},
|
},
|
||||||
sessionType:"temporary",
|
sessionType:"temporary",
|
||||||
sessionCount:1,
|
|
||||||
crossOrigin:true,
|
crossOrigin:true,
|
||||||
duration:1.60,
|
duration:1.60,
|
||||||
},
|
},
|
||||||
|
@ -716,7 +714,6 @@ var gEMETests = [
|
||||||
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
||||||
},
|
},
|
||||||
sessionType:"temporary",
|
sessionType:"temporary",
|
||||||
sessionCount:2,
|
|
||||||
duration:1.60,
|
duration:1.60,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -746,7 +743,6 @@ var gEMETests = [
|
||||||
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
|
||||||
},
|
},
|
||||||
sessionType:"temporary",
|
sessionType:"temporary",
|
||||||
sessionCount:2,
|
|
||||||
crossOrigin:true,
|
crossOrigin:true,
|
||||||
duration:1.60,
|
duration:1.60,
|
||||||
},
|
},
|
||||||
|
|
|
@ -48,11 +48,11 @@ function startTest(test, token)
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
var gotEncrypted = 0;
|
var gotEncrypted = false;
|
||||||
var gotPlaying = false;
|
var gotPlaying = false;
|
||||||
|
|
||||||
v.addEventListener("encrypted", function(ev) {
|
v.addEventListener("encrypted", function(ev) {
|
||||||
gotEncrypted += 1;
|
gotEncrypted = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
v.addEventListener("playing", function () { gotPlaying = true; });
|
v.addEventListener("playing", function () { gotPlaying = true; });
|
||||||
|
@ -66,9 +66,7 @@ function startTest(test, token)
|
||||||
v.addEventListener("ended", function(ev) {
|
v.addEventListener("ended", function(ev) {
|
||||||
ok(true, TimeStamp(token) + " got ended event");
|
ok(true, TimeStamp(token) + " got ended event");
|
||||||
|
|
||||||
is(gotEncrypted, test.sessionCount,
|
ok(gotEncrypted, TimeStamp(token) + " encrypted event should have fired");
|
||||||
TimeStamp(token) + " encrypted events expected: " + test.sessionCount
|
|
||||||
+ ", actual: " + gotEncrypted);
|
|
||||||
ok(gotPlaying, TimeStamp(token) + " playing event should have fired");
|
ok(gotPlaying, TimeStamp(token) + " playing event should have fired");
|
||||||
|
|
||||||
ok(Math.abs(test.duration - v.duration) < 0.1,
|
ok(Math.abs(test.duration - v.duration) < 0.1,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче