Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make cookie comparator test pass on Windows.

Browse source
This commit is contained in:
Josh Matthews 2016-03-28 09:55:32 -04:00
parent 803f39df19
commit 50a7a34294
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/unit/net/cookie.rs
View file

@ -8,7 +8,6 @@ use net::cookie::Cookie;
use net::cookie_storage::CookieStorage; use net::cookie_storage::CookieStorage;
use net_traits::CookieSource; use net_traits::CookieSource;
#[test] #[test]
fn test_domain_match() { fn test_domain_match() {
assert!(Cookie::domain_match("foo.com", "foo.com")); assert!(Cookie::domain_match("foo.com", "foo.com"));
@ -100,6 +99,20 @@ fn fn_cookie_constructor() {
assert!(Cookie::new_wrapped(cookie, u, CookieSource::HTTP).is_some()); assert!(Cookie::new_wrapped(cookie, u, CookieSource::HTTP).is_some());
} }
#[cfg(target_os = "windows")]
fn delay_to_ensure_different_timestamp() {
use std::thread;
use std::time::Duration;
// time::now()'s resolution on some platforms isn't granular enought to ensure
// that two back-to-back calls to Cookie::new_wrapped generate different timestamps .
thread::sleep(Duration::from_millis(500));
}
#[cfg(not(target_os = "windows"))]
fn delay_to_ensure_different_timestamp() {
}
#[test] #[test]
fn test_sort_order() { fn test_sort_order() {
use std::cmp::Ordering; use std::cmp::Ordering;
@ -107,6 +120,7 @@ fn test_sort_order() {
let url = &url!("http://example.com/foo"); let url = &url!("http://example.com/foo");
let a_wrapped = cookie_rs::Cookie::parse("baz=bar; Path=/foo/bar/").unwrap(); let a_wrapped = cookie_rs::Cookie::parse("baz=bar; Path=/foo/bar/").unwrap();
let a = Cookie::new_wrapped(a_wrapped.clone(), url, CookieSource::HTTP).unwrap(); let a = Cookie::new_wrapped(a_wrapped.clone(), url, CookieSource::HTTP).unwrap();
delay_to_ensure_different_timestamp();
let a_prime = Cookie::new_wrapped(a_wrapped, url, CookieSource::HTTP).unwrap(); let a_prime = Cookie::new_wrapped(a_wrapped, url, CookieSource::HTTP).unwrap();
let b = cookie_rs::Cookie::parse("baz=bar;Path=/foo/bar/baz/").unwrap(); let b = cookie_rs::Cookie::parse("baz=bar;Path=/foo/bar/baz/").unwrap();
let b = Cookie::new_wrapped(b, url, CookieSource::HTTP).unwrap(); let b = Cookie::new_wrapped(b, url, CookieSource::HTTP).unwrap();