From 3900324d3393e91647888361fbac3a321c53c7fc Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Wed, 24 Nov 2021 15:26:10 -0500
Subject: [PATCH] fix: Organize imports

---
 influxdb_iox/tests/common/server_fixture.rs   | 30 ++++++------
 .../tests/end_to_end_cases/scenario.rs        | 46 ++++++++++---------
 .../tests/end_to_end_cases/tracing.rs         |  3 +-
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/influxdb_iox/tests/common/server_fixture.rs b/influxdb_iox/tests/common/server_fixture.rs
index c53f95ae54..8c5d01010f 100644
--- a/influxdb_iox/tests/common/server_fixture.rs
+++ b/influxdb_iox/tests/common/server_fixture.rs
@@ -1,26 +1,24 @@
-use std::collections::HashMap;
-use std::net::SocketAddrV4;
-use std::num::NonZeroU32;
-use std::sync::atomic::{AtomicU16, Ordering};
-use std::sync::Arc;
-use std::time::Duration;
-use std::{
-    path::Path,
-    process::{Child, Command},
-    str,
-    sync::Weak,
-    time::Instant,
-};
-
 use assert_cmd::prelude::*;
 use futures::prelude::*;
 use generated_types::influxdata::iox::management::v1::{
     database_status::DatabaseState, ServerStatus,
 };
-use http::header::HeaderName;
-use http::HeaderValue;
+use http::{header::HeaderName, HeaderValue};
 use influxdb_iox_client::connection::Connection;
 use once_cell::sync::OnceCell;
+use std::{
+    collections::HashMap,
+    net::SocketAddrV4,
+    num::NonZeroU32,
+    path::Path,
+    process::{Child, Command},
+    str,
+    sync::{
+        atomic::{AtomicU16, Ordering},
+        Arc, Weak,
+    },
+    time::{Duration, Instant},
+};
 use tempfile::{NamedTempFile, TempDir};
 use tokio::sync::Mutex;
 use uuid::Uuid;
diff --git a/influxdb_iox/tests/end_to_end_cases/scenario.rs b/influxdb_iox/tests/end_to_end_cases/scenario.rs
index 193a30e9c6..dd54290f10 100644
--- a/influxdb_iox/tests/end_to_end_cases/scenario.rs
+++ b/influxdb_iox/tests/end_to_end_cases/scenario.rs
@@ -1,38 +1,40 @@
-use std::collections::HashMap;
-use std::num::NonZeroU32;
-use std::path::Path;
-use std::time::Duration;
-use std::{convert::TryInto, str, u32};
-use std::{sync::Arc, time::SystemTime};
-
+use crate::common::server_fixture::{ServerFixture, ServerType, TestConfig, DEFAULT_SERVER_ID};
 use arrow::{
     array::{ArrayRef, Float64Array, StringArray, TimestampNanosecondArray},
     record_batch::RecordBatch,
 };
-use data_types::chunk_metadata::{ChunkStorage, ChunkSummary};
+use data_types::{
+    chunk_metadata::{ChunkStorage, ChunkSummary},
+    names::org_and_bucket_to_database,
+    DatabaseName,
+};
 use futures::prelude::*;
-use influxdb_iox_client::management::generated_types::partition_template;
-use influxdb_iox_client::management::generated_types::WriteBufferConnection;
+use generated_types::{
+    google::protobuf::Empty,
+    influxdata::iox::{management::v1::*, write_buffer::v1::WriteBufferCreationConfig},
+    ReadSource, TimestampRange,
+};
+use influxdb_iox_client::{
+    connection::Connection,
+    flight::PerformQuery,
+    management::generated_types::{partition_template, WriteBufferConnection},
+};
 use prost::Message;
 use rand::{
     distributions::{Alphanumeric, Standard},
     thread_rng, Rng,
 };
+use std::{
+    collections::HashMap, convert::TryInto, num::NonZeroU32, path::Path, str, sync::Arc,
+    time::Duration, time::SystemTime, u32,
+};
 use tempfile::TempDir;
 use test_helpers::assert_contains;
-
-use data_types::{names::org_and_bucket_to_database, DatabaseName};
-use generated_types::google::protobuf::Empty;
-use generated_types::{
-    influxdata::iox::{management::v1::*, write_buffer::v1::WriteBufferCreationConfig},
-    ReadSource, TimestampRange,
-};
-use influxdb_iox_client::{connection::Connection, flight::PerformQuery};
 use time::SystemProvider;
-use write_buffer::core::{WriteBufferReading, WriteBufferWriting};
-use write_buffer::file::{FileBufferConsumer, FileBufferProducer};
-
-use crate::common::server_fixture::{ServerFixture, ServerType, TestConfig, DEFAULT_SERVER_ID};
+use write_buffer::{
+    core::{WriteBufferReading, WriteBufferWriting},
+    file::{FileBufferConsumer, FileBufferProducer},
+};
 
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
 type Result<T, E = Error> = std::result::Result<T, E>;
diff --git a/influxdb_iox/tests/end_to_end_cases/tracing.rs b/influxdb_iox/tests/end_to_end_cases/tracing.rs
index 64ba838b07..0be000943a 100644
--- a/influxdb_iox/tests/end_to_end_cases/tracing.rs
+++ b/influxdb_iox/tests/end_to_end_cases/tracing.rs
@@ -1,5 +1,3 @@
-use std::num::NonZeroU32;
-
 use super::scenario::{collect_query, Scenario};
 use crate::common::{
     server_fixture::{ServerFixture, ServerType, TestConfig},
@@ -7,6 +5,7 @@ use crate::common::{
 };
 use futures::TryStreamExt;
 use generated_types::{storage_client::StorageClient, ReadFilterRequest};
+use std::num::NonZeroU32;
 
 async fn setup() -> (UdpCapture, ServerFixture) {
     let udp_capture = UdpCapture::new().await;