summaryrefslogtreecommitdiffstats
path: root/net/ftp
diff options
context:
space:
mode:
authorellyjones <ellyjones@chromium.org>2015-08-24 06:17:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 13:18:23 +0000
commit7b4c1f468e3198cf127527ddbc40e1802238328a (patch)
treef16e57199ea287640c357f479ffe85a5505f6575 /net/ftp
parent116dd4ed6ca117e730c8adb79dc8d192b5c13362 (diff)
downloadchromium_src-7b4c1f468e3198cf127527ddbc40e1802238328a.zip
chromium_src-7b4c1f468e3198cf127527ddbc40e1802238328a.tar.gz
chromium_src-7b4c1f468e3198cf127527ddbc40e1802238328a.tar.bz2
ftp: reenable disabled date parsing test
This test was broken on Linux when base::Time was 32-bit, but it no longer is. BUG=488592 Review URL: https://codereview.chromium.org/1297593006 Cr-Commit-Position: refs/heads/master@{#345056}
Diffstat (limited to 'net/ftp')
-rw-r--r--net/ftp/ftp_directory_listing_parser_windows_unittest.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
index 1c6234e..b343eb9 100644
--- a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
+++ b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
@@ -38,12 +38,9 @@ TEST_F(FtpDirectoryListingParserWindowsTest, Good) {
{ "01-06-80 02:42AM 458 Corner3.txt",
FtpDirectoryListingEntry::FILE, "Corner3.txt", 458,
1980, 1, 6, 2, 42 },
-#if !defined(OS_LINUX) && !defined(OS_ANDROID)
- // TODO(phajdan.jr): Re-enable when 2038-year problem is fixed on Linux.
{ "01-06-79 02:42AM 458 Corner4",
FtpDirectoryListingEntry::FILE, "Corner4", 458,
2079, 1, 6, 2, 42 },
-#endif // !defined (OS_LINUX) && !defined(OS_ANDROID)
{ "01-06-1979 02:42AM 458 Readme.txt",
FtpDirectoryListingEntry::FILE, "Readme.txt", 458,
1979, 1, 6, 2, 42 },