Title: [166275] trunk/Tools
- Revision
- 166275
- Author
- aes...@apple.com
- Date
- 2014-03-25 18:47:26 -0700 (Tue, 25 Mar 2014)
Log Message
Fix a failing API test on Mountain Lion and remove temporary debug logging.
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
(-[DownloadDelegate _download:didReceiveData:]):
(-[DownloadDelegate _downloadDidFinish:]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (166274 => 166275)
--- trunk/Tools/ChangeLog 2014-03-26 00:57:25 UTC (rev 166274)
+++ trunk/Tools/ChangeLog 2014-03-26 01:47:26 UTC (rev 166275)
@@ -1,3 +1,11 @@
+2014-03-25 Andy Estes <aes...@apple.com>
+
+ Fix a failing API test on Mountain Lion and remove temporary debug logging.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
+ (-[DownloadDelegate _download:didReceiveData:]):
+ (-[DownloadDelegate _downloadDidFinish:]):
+
2014-03-25 Brian Burg <bb...@apple.com>
Web Replay: resource unique identifiers should be unique-per-frame, not globally
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm (166274 => 166275)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2014-03-26 00:57:25 UTC (rev 166274)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2014-03-26 01:47:26 UTC (rev 166275)
@@ -87,7 +87,6 @@
- (void)_download:(_WKDownload *)download didReceiveData:(uint64_t)length
{
- NSLog(@"didReceiveData: %llu\n", length);
EXPECT_EQ(_download, download);
_receivedContentLength += length;
}
@@ -107,8 +106,10 @@
- (void)_downloadDidFinish:(_WKDownload *)download
{
- NSLog(@"_expectedContentLength: %lld\n", _expectedContentLength);
- NSLog(@"_receivedContentLength: %llu\n", _receivedContentLength);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1080
+ // Work around <rdar://problem/7611450> NSURLDownload calls didReceiveDataOfLength: delegate method too many times
+ _receivedContentLength /= 2;
+#endif
EXPECT_EQ(_download, download);
EXPECT_TRUE(_expectedContentLength == NSURLResponseUnknownLength || static_cast<uint64_t>(_expectedContentLength) == _receivedContentLength);
EXPECT_TRUE([[NSFileManager defaultManager] contentsEqualAtPath:_destinationPath andPath:[_sourceURL path]]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
