Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_mark.html

Issue 1191043004: Import hr-time and user-timing tests, remove redundant webperf copies (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add idlharness result Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_mark.html
diff --git a/LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_mark.htm b/LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_mark.html
similarity index 95%
rename from LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_mark.htm
rename to LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_mark.html
index 89fdde90e50610b60bdd2479a0acdde301937944..aa3fd75ee324d614423842372084acb8a84a36fc 100644
--- a/LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_mark.htm
+++ b/LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_mark.html
@@ -4,10 +4,10 @@
<meta charset="UTF-8" />
<title>window.performance User Timing mark() method is working properly</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
- <link rel="help" href="http://127.0.0.1:8000/webperf/specs/UserTiming/#dom-performance-mark"/>
- <script src="/w3c/resources/testharness.js"></script>
- <script src="/w3c/resources/testharnessreport.js"></script>
- <script src="/w3c/webperf/resources/webperftestharness.js"></script>
+ <link rel="help" href="http://www.w3.org/TR/user-timing/#dom-performance-mark"/>
+ <script src="../../../resources/testharness.js"></script>
+ <script src="../../../resources/testharnessreport.js"></script>
+ <script src="resources/webperftestharness.js"></script>
<script type="text/javascript">
// test data
@@ -29,7 +29,7 @@
}
];
- setup({timeout:1000, explicit_done: true});
+ setup({explicit_done: true});
test_namespace();
@@ -183,7 +183,7 @@
// test startTime, allow for an acceptable threshold in the difference between the startTime and the
// expected value for the startTime (loadEventStart + markTestDelay)
test_true(Math.abs(markEntry.startTime - expectedStartTime) <= testThreshold,
- markEntryCommand + ".startTime ~== " + " (up to " + testThreshold +
+ markEntryCommand + ".startTime ~== " + expectedStartTime + " (up to " + testThreshold +
"ms difference allowed)");
// verify entryType

Powered by Google App Engine
This is Rietveld 408576698