Skip to content

Commit

Permalink
Fix some warnings and failures
Browse files Browse the repository at this point in the history
  • Loading branch information
aidanhs authored and luser committed Oct 25, 2018
1 parent ab2b035 commit 06b9999
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ memcached = ["memcached-rs"]
# Enable features that require unstable features of Nightly Rust.
unstable = []
# Enables distributed support in the sccache client
dist-client = ["ar", "flate2", "hyper", "reqwest", "url"]
dist-client = ["ar", "flate2", "hyper", "reqwest", "rust-crypto", "url"]
# Enables the sccache-dist binary
dist-server = ["arraydeque", "crossbeam-utils", "jsonwebtoken", "flate2", "libmount", "nix", "openssl", "reqwest", "rouille"]
# Enables dist tests with external requirements
Expand Down
8 changes: 4 additions & 4 deletions tests/oauth.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![cfg(all(feature = "dist-client", feature = "dist-tests"))]
extern crate assert_cmd;
extern crate chrono;
extern crate escargot;
Expand All @@ -12,7 +13,7 @@ use escargot::CargoBuild;
use sccache::config::DistAuth;
use selenium_rs::webdriver::{Browser, WebDriver, Selector};
use std::fs;
use std::io::{self, Read, Write};
use std::io::{self, Read};
use std::net::TcpStream;
use std::path::Path;
use std::process::{Command, Output, Stdio};
Expand Down Expand Up @@ -162,7 +163,6 @@ impl Drop for SeleniumContainer {
}

#[test]
#[cfg(feature = "dist-client")]
#[cfg_attr(not(all(target_os = "linux", target_arch = "x86_64", feature = "dist-tests")), ignore)]
fn test_auth() {
// Make sure the client auth port isn't in use, as sccache will gracefully fall back
Expand All @@ -173,7 +173,7 @@ fn test_auth() {
// selenium instance (download the standalone server and the chrome driver, running the former and putting the
// latter on the PATH). Alternatively, because we use the '-debug' image you can use vnc with the password 'secret'.
assert_eq!(TcpStream::connect(("localhost", 4444)).unwrap_err().kind(), io::ErrorKind::ConnectionRefused);
let selenium = SeleniumContainer::new();
let _selenium = SeleniumContainer::new();
thread::sleep(Duration::from_secs(3));

// Code grant PKCE
Expand Down Expand Up @@ -204,7 +204,7 @@ fn test_auth_with_config(dist_auth: sccache::config::DistAuth) {
match status {
Some(s) => assert!(s.success()),
None => {
sccache_process.kill();
sccache_process.kill().unwrap();
panic!("Waited too long for process to exit")
},
}
Expand Down

0 comments on commit 06b9999

Please sign in to comment.