CI: keep test vectors byte-exact on Windows, short agent paths on macOS
Windows checkouts converted LF vectors to CRLF; SystemTime there has 100 ns resolution. macOS's long $TMPDIR pushed the agent socket past SUN_LEN.
This commit is contained in:
@@ -0,0 +1,2 @@
|
|||||||
|
# Test vectors are compared byte for byte; never convert line endings.
|
||||||
|
tests/vectors/** -text
|
||||||
+3
-2
@@ -526,12 +526,13 @@ mod tests {
|
|||||||
);
|
);
|
||||||
assert_eq!(Instant::parse_rfc3339("2023-02-29T00:00:00Z"), None);
|
assert_eq!(Instant::parse_rfc3339("2023-02-29T00:00:00Z"), None);
|
||||||
assert!(Instant::parse_rfc3339("2024-02-29T00:00:00Z").is_some());
|
assert!(Instant::parse_rfc3339("2024-02-29T00:00:00Z").is_some());
|
||||||
let neg = Instant::from_system(std::time::UNIX_EPOCH - Duration::new(0, 1));
|
// 100 ns: Windows' SystemTime resolution.
|
||||||
|
let neg = Instant::from_system(std::time::UNIX_EPOCH - Duration::new(0, 100));
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
neg,
|
neg,
|
||||||
Instant {
|
Instant {
|
||||||
secs: -1,
|
secs: -1,
|
||||||
nanos: 999_999_999
|
nanos: 999_999_900
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
assert_eq!(Instant::from_system(neg.to_system()), neg);
|
assert_eq!(Instant::from_system(neg.to_system()), neg);
|
||||||
|
|||||||
+7
-1
@@ -24,7 +24,13 @@ struct Env {
|
|||||||
|
|
||||||
impl Env {
|
impl Env {
|
||||||
fn new(tag: &str) -> Env {
|
fn new(tag: &str) -> Env {
|
||||||
let dir = std::env::temp_dir().join(format!(
|
// Not temp_dir(): macOS's long $TMPDIR pushes the agent socket path
|
||||||
|
// past SUN_LEN.
|
||||||
|
#[cfg(unix)]
|
||||||
|
let base = PathBuf::from("/tmp");
|
||||||
|
#[cfg(not(unix))]
|
||||||
|
let base = std::env::temp_dir();
|
||||||
|
let dir = base.join(format!(
|
||||||
"vault-cli-{tag}-{}-{}",
|
"vault-cli-{tag}-{}-{}",
|
||||||
std::process::id(),
|
std::process::id(),
|
||||||
std::time::SystemTime::now()
|
std::time::SystemTime::now()
|
||||||
|
|||||||
Reference in New Issue
Block a user