Backed out changeset 13c7176938cd (bug 1144409)

This commit is contained in:
Ryan VanderMeulen 2015-03-31 11:16:21 -04:00
parent a310d932fe
commit fca0d306ae
2 changed files with 3 additions and 9 deletions

View File

@ -664,7 +664,6 @@ var gEMETests = [
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
},
sessionType:"temporary",
sessionCount:1,
duration:1.60,
},
{
@ -685,7 +684,6 @@ var gEMETests = [
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
},
sessionType:"temporary",
sessionCount:1,
crossOrigin:true,
duration:1.60,
},
@ -716,7 +714,6 @@ var gEMETests = [
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
},
sessionType:"temporary",
sessionCount:2,
duration:1.60,
},
{
@ -746,7 +743,6 @@ var gEMETests = [
"7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444",
},
sessionType:"temporary",
sessionCount:2,
crossOrigin:true,
duration:1.60,
},

View File

@ -48,11 +48,11 @@ function startTest(test, token)
}
);
var gotEncrypted = 0;
var gotEncrypted = false;
var gotPlaying = false;
v.addEventListener("encrypted", function(ev) {
gotEncrypted += 1;
gotEncrypted = true;
});
v.addEventListener("playing", function () { gotPlaying = true; });
@ -66,9 +66,7 @@ function startTest(test, token)
v.addEventListener("ended", function(ev) {
ok(true, TimeStamp(token) + " got ended event");
is(gotEncrypted, test.sessionCount,
TimeStamp(token) + " encrypted events expected: " + test.sessionCount
+ ", actual: " + gotEncrypted);
ok(gotEncrypted, TimeStamp(token) + " encrypted event should have fired");
ok(gotPlaying, TimeStamp(token) + " playing event should have fired");
ok(Math.abs(test.duration - v.duration) < 0.1,