--wip-- [skip ci]

vectordotdev · Mar 20, 2020 · d2e04c7 · d2e04c7
1 parent 8a24906
commit d2e04c7
Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/topology/mod.rs b/src/topology/mod.rs
@@ -113,7 +113,7 @@ impl RunningTopology {
         }
         let mut check_handles2 = check_handles.clone();
 
-        let deadline = Instant::now() + Duration::from_secs(60);
+        let deadline = Instant::now() + Duration::from_secs(5);
 
         let timeout = timer::Delay::new(deadline)
             .map(move |_| {

diff --git a/tests/buffering.rs b/tests/buffering.rs
@@ -198,7 +198,7 @@ fn test_max_size() {
 
 #[test]
 fn test_max_size_resume() {
-    vector::test_util::trace_init();
+    test_util::trace_init();
 
     let data_dir = tempdir().unwrap();
     let data_dir = data_dir.path().to_path_buf();
@@ -246,22 +246,18 @@ fn test_max_size_resume() {
     let send2 = send_lines(in_addr2, input_lines2.clone().into_iter());
     rt.block_on(send1.join(send2)).unwrap();
 
-    std::thread::sleep(std::time::Duration::from_millis(100));
-
     let output_lines = receive(&out_addr);
 
-    rt.block_on(topology.stop()).unwrap();
-
+    block_on(topology.stop()).unwrap();
     shutdown_on_idle(rt);
 
     let output_lines = output_lines.wait();
     assert_eq!(num_lines * 2, output_lines.len());
 }
 
 #[test]
-#[ignore]
 fn test_reclaim_disk_space() {
-    vector::test_util::trace_init();
+    test_util::trace_init();
 
     let data_dir = tempdir().unwrap();
     let data_dir = data_dir.path().to_path_buf();
@@ -299,10 +295,8 @@ fn test_reclaim_disk_space() {
     let send = send_lines(in_addr, input_lines.clone().into_iter());
     rt.block_on(send).unwrap();
 
-    std::thread::sleep(std::time::Duration::from_millis(10000));
-
-    rt.shutdown_now().wait().unwrap();
-    drop(topology);
+    block_on(topology.stop()).unwrap();
+    shutdown_on_idle(rt);
 
     let before_disk_size: u64 = walkdir::WalkDir::new(&data_dir)
         .into_iter()
@@ -344,10 +338,7 @@ fn test_reclaim_disk_space() {
     let send = send_lines(in_addr, input_lines2.clone().into_iter());
     rt.block_on(send).unwrap();
 
-    std::thread::sleep(std::time::Duration::from_millis(1000));
-
     block_on(topology.stop()).unwrap();
-
     shutdown_on_idle(rt);
 
     let output_lines = output_lines.wait();