Merge pull request #4561 from cakebaker/wildcard_imports

tests: expand wildcard imports

tests/by-util/test_arch.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_arch() {

tests/by-util/test_base32.rs

@@ -6,7 +6,7 @@
 // that was distributed with this source code.
 //
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_encode() {

tests/by-util/test_base64.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_encode() {

tests/by-util/test_basename.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (words) reallylongexecutable
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 #[cfg(any(unix, target_os = "redox"))]
 use std::ffi::OsStr;
 

tests/by-util/test_basenc.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_z85_not_padded() {

tests/by-util/test_cat.rs

@@ -1,6 +1,8 @@
 // spell-checker:ignore NOFILE
 
-use crate::common::util::*;
+#[cfg(not(windows))]
+use crate::common::util::vec_of_size;
+use crate::common::util::TestScenario;
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use rlimit::Resource;
 use std::fs::OpenOptions;

tests/by-util/test_chgrp.rs

@@ -1,7 +1,7 @@
 // spell-checker:ignore (words) nosuchgroup groupname
 
-use crate::common::util::*;
-use rust_users::*;
+use crate::common::util::TestScenario;
+use rust_users::get_effective_gid;
 
 #[test]
 fn test_invalid_option() {

tests/by-util/test_chmod.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::{AtPath, TestScenario, UCommand};
 use once_cell::sync::Lazy;
 use std::fs::{metadata, set_permissions, OpenOptions, Permissions};
 use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};

tests/by-util/test_chown.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (words) agroupthatdoesntexist auserthatdoesntexist cuuser groupname notexisting passgrp
 
-use crate::common::util::*;
+use crate::common::util::{is_ci, run_ucmd_as_root, CmdResult, TestScenario};
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use rust_users::get_effective_uid;
 

tests/by-util/test_chroot.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (words) araba newroot userspec chdir pwd's isroot
 
-use crate::common::util::*;
+use crate::common::util::{is_ci, run_ucmd_as_root, TestScenario};
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_cksum.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (words) asdf
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_comm.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (words) defaultcheck nocheck
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_cp.rs

@@ -1,6 +1,6 @@
 // spell-checker:ignore (flags) reflink (fs) tmpfs (linux) rlimit Rlim NOFILE clob btrfs ROOTDIR USERDIR procfs outfile
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 #[cfg(not(windows))]
 use std::fs::set_permissions;
 

tests/by-util/test_csplit.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 use glob::glob;
 
 /// Returns a string of numbers with the given range, each on a new line.

tests/by-util/test_cut.rs

@@ -1,4 +1,4 @@
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 static INPUT: &str = "lists.txt";
 

tests/by-util/test_date.rs

@@ -1,9 +1,9 @@
 extern crate regex;
 
 use self::regex::Regex;
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 #[cfg(all(unix, not(target_os = "macos")))]
-use rust_users::*;
+use rust_users::get_effective_uid;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_dd.rs

@@ -1,6 +1,8 @@
 // spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, availible, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, iseek, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, oseek, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat abcdefghijklm abcdefghi nabcde nabcdefg abcdefg
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
+#[cfg(not(windows))]
+use crate::common::util::{UCommand, TESTS_BINARY};
 
 use regex::Regex;
 

tests/by-util/test_df.rs

@@ -1,7 +1,7 @@
 // spell-checker:ignore udev pcent iuse itotal iused ipcent
 use std::collections::HashSet;
 
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_dir.rs

@@ -5,7 +5,7 @@ extern crate regex;
 extern crate tempfile;
 
 use self::regex::Regex;
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 /*
  * As dir use the same functions than ls, we don't have to retest them here.

tests/by-util/test_dircolors.rs

@@ -1,5 +1,5 @@
 // spell-checker:ignore overridable
-use crate::common::util::*;
+use crate::common::util::TestScenario;
 
 extern crate dircolors;
 use self::dircolors::{guess_syntax, OutputFmt, StrUtils};