Permalink
Browse files

Reorganize integration tests as one crate with many modules. Issue #4867

.
  • Loading branch information...
rochamatcomp authored and Eh2406 committed Feb 8, 2018
1 parent b80af35 commit c2ff988c9f09ab6d865088f57c99c967590111bf
Showing with 107 additions and 237 deletions.
  1. +5 −1 Cargo.toml
  2. +0 −3 tests/{alt-registry.rs → testsuite/alt_registry.rs}
  3. +0 −3 tests/{bad-config.rs → testsuite/bad_config.rs}
  4. +0 −3 tests/{bad-manifest-path.rs → testsuite/bad_manifest_path.rs}
  5. +0 −4 tests/{ → testsuite}/bench.rs
  6. +0 −6 tests/{ → testsuite}/build.rs
  7. +2 −5 tests/{build-auth.rs → testsuite/build_auth.rs}
  8. 0 tests/{build-lib.rs → testsuite/build_lib.rs}
  9. +0 −3 tests/{build-script.rs → testsuite/build_script.rs}
  10. +0 −3 tests/{build-script-env.rs → testsuite/build_script_env.rs}
  11. +0 −4 tests/{ → testsuite}/cargo.rs
  12. +0 −2 tests/{ → testsuite}/cargo_alias_config.rs
  13. +0 −3 tests/{cargo-features.rs → testsuite/cargo_features.rs}
  14. +1 −1 tests/{ → testsuite}/cargotest/Cargo.toml
  15. 0 tests/{ → testsuite}/cargotest/install.rs
  16. 0 tests/{ → testsuite}/cargotest/lib.rs
  17. 0 tests/{ → testsuite}/cargotest/support/cross_compile.rs
  18. 0 tests/{ → testsuite}/cargotest/support/git.rs
  19. 0 tests/{ → testsuite}/cargotest/support/mod.rs
  20. 0 tests/{ → testsuite}/cargotest/support/paths.rs
  21. 0 tests/{ → testsuite}/cargotest/support/publish.rs
  22. 0 tests/{ → testsuite}/cargotest/support/registry.rs
  23. +0 −4 tests/{ → testsuite}/cfg.rs
  24. 0 tests/{ → testsuite}/check-style.sh
  25. +0 −4 tests/{ → testsuite}/check.rs
  26. +0 −3 tests/{ → testsuite}/clean.rs
  27. +2 −4 tests/{ → testsuite}/concurrent.rs
  28. +0 −3 tests/{ → testsuite}/config.rs
  29. +0 −4 tests/{cross-compile.rs → testsuite/cross_compile.rs}
  30. +0 −6 tests/{cross-publish.rs → testsuite/cross_publish.rs}
  31. +0 −5 tests/{ → testsuite}/death.rs
  32. +0 −3 tests/{dep-info.rs → testsuite/dep_info.rs}
  33. +1 −7 tests/{ → testsuite}/directory.rs
  34. +1 −4 tests/{ → testsuite}/doc.rs
  35. +0 −4 tests/{ → testsuite}/features.rs
  36. +0 −3 tests/{ → testsuite}/fetch.rs
  37. +0 −3 tests/{ → testsuite}/freshness.rs
  38. +0 −3 tests/{generate-lockfile.rs → testsuite/generate_lockfile.rs}
  39. +1 −5 tests/{ → testsuite}/git.rs
  40. +1 −5 tests/{ → testsuite}/init.rs
  41. +1 −4 tests/{ → testsuite}/install.rs
  42. +0 −3 tests/{ → testsuite}/jobserver.rs
  43. +82 −0 tests/testsuite/lib.rs
  44. +0 −4 tests/{local-registry.rs → testsuite/local_registry.rs}
  45. +0 −3 tests/{lockfile-compat.rs → testsuite/lockfile_compat.rs}
  46. +1 −6 tests/{ → testsuite}/login.rs
  47. +0 −3 tests/{ → testsuite}/metadata.rs
  48. +0 −3 tests/{net-config.rs → testsuite/net_config.rs}
  49. +1 −5 tests/{ → testsuite}/new.rs
  50. +0 −3 tests/{ → testsuite}/overrides.rs
  51. +2 −7 tests/{ → testsuite}/package.rs
  52. +1 −5 tests/{ → testsuite}/patch.rs
  53. +1 −5 tests/{ → testsuite}/path.rs
  54. +0 −3 tests/{ → testsuite}/plugins.rs
  55. +0 −3 tests/{proc-macro.rs → testsuite/proc_macro.rs}
  56. +0 −3 tests/{ → testsuite}/profiles.rs
  57. +0 −5 tests/{ → testsuite}/publish.rs
  58. +0 −3 tests/{read-manifest.rs → testsuite/read_manifest.rs}
  59. +0 −5 tests/{ → testsuite}/registry.rs
  60. +0 −3 tests/{required-features.rs → testsuite/required_features.rs}
  61. +0 −3 tests/{ → testsuite}/resolve.rs
  62. +0 −4 tests/{ → testsuite}/run.rs
  63. +0 −3 tests/{ → testsuite}/rustc.rs
  64. +0 −3 tests/{ → testsuite}/rustdoc.rs
  65. +0 −3 tests/{ → testsuite}/rustdocflags.rs
  66. +0 −3 tests/{ → testsuite}/rustflags.rs
  67. +1 −5 tests/{ → testsuite}/search.rs
  68. +1 −5 tests/{small-fd-limits.rs → testsuite/small_fd_limits.rs}
  69. +1 −4 tests/{ → testsuite}/test.rs
  70. +0 −3 tests/{tool-paths.rs → testsuite/tool_paths.rs}
  71. +0 −3 tests/{verify-project.rs → testsuite/verify_project.rs}
  72. +1 −4 tests/{ → testsuite}/version.rs
  73. +0 −3 tests/{warn-on-failure.rs → testsuite/warn_on_failure.rs}
  74. +0 −4 tests/{ → testsuite}/workspaces.rs
@@ -80,11 +80,15 @@ features = [
[dev-dependencies]
bufstream = "0.1"
cargotest = { path = "tests/cargotest", version = "0.1" }
cargotest = { path = "tests/testsuite/cargotest", version = "0.1" }
filetime = "0.1"
hamcrest = "=0.1.1"
[[bin]]
name = "cargo"
test = false
doc = false
[[test]]
name = "testsuite"
path = "tests/testsuite/lib.rs"
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::ChannelChanger;
use cargotest::support::registry::{self, Package, alt_api_path};
use cargotest::support::{paths, project, execs};
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::support::{project, execs};
use cargotest::support::registry::Package;
use hamcrest::assert_that;
@@ -1,6 +1,3 @@
extern crate hamcrest;
extern crate cargotest;
use cargotest::support::{project, execs, main_file, basic_bin_manifest};
use hamcrest::{assert_that};
@@ -1,7 +1,3 @@
extern crate cargotest;
extern crate cargo;
extern crate hamcrest;
use std::str;
use cargo::util::process;
@@ -1,9 +1,3 @@
extern crate cargo;
#[macro_use]
extern crate cargotest;
extern crate hamcrest;
extern crate tempdir;
use std::env;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,13 +1,10 @@
extern crate bufstream;
extern crate git2;
extern crate cargotest;
extern crate hamcrest;
use std;
use std::collections::HashSet;
use std::io::prelude::*;
use std::net::TcpListener;
use std::thread;
use git2;
use bufstream::BufStream;
use cargotest::support::paths;
use cargotest::support::{project, execs};
File renamed without changes.
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use std::env;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use std::fs::File;
use cargotest::sleep_ms;
@@ -1,7 +1,3 @@
extern crate cargo;
extern crate cargotest;
extern crate hamcrest;
use std::env;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,5 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::support::{project, execs, basic_bin_manifest};
use hamcrest::{assert_that};
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::ChannelChanger;
use cargotest::support::{project, execs};
use hamcrest::assert_that;
@@ -7,7 +7,7 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"]
path = "lib.rs"
[dependencies]
cargo = { path = "../.." }
cargo = { path = "../../.." }
filetime = "0.1"
flate2 = "1.0"
git2 = { version = "0.6", default-features = false }
File renamed without changes.
@@ -1,7 +1,3 @@
extern crate cargo;
extern crate cargotest;
extern crate hamcrest;
use std::str::FromStr;
use std::fmt;
File renamed without changes.
@@ -1,7 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
extern crate glob;
use cargotest::is_nightly;
use cargotest::support::{execs, project};
use cargotest::support::registry::Package;
@@ -1,6 +1,3 @@
extern crate hamcrest;
extern crate cargotest;
use std::env;
use cargotest::support::{git, project, execs, main_file, basic_bin_manifest};
@@ -1,7 +1,3 @@
extern crate cargotest;
extern crate git2;
extern crate hamcrest;
use std::{env, str};
use std::fs::{self, File};
use std::io::Write;
@@ -11,6 +7,8 @@ use std::thread;
use std::sync::mpsc::channel;
use std::time::Duration;
use git2;
use cargotest;
use cargotest::install::{has_installed_exe, cargo_home};
use cargotest::support::git;
use cargotest::support::registry::Package;
@@ -1,6 +1,3 @@
extern crate hamcrest;
extern crate cargotest;
use cargotest::support::{project, execs};
use hamcrest::assert_that;
@@ -1,7 +1,3 @@
extern crate cargo;
extern crate cargotest;
extern crate hamcrest;
use cargo::util::process;
use cargotest::{is_nightly, rustc_host};
use cargotest::support::{project, execs, basic_bin_manifest, cross_compile};
@@ -1,9 +1,3 @@
extern crate cargo;
extern crate cargotest;
extern crate hamcrest;
extern crate flate2;
extern crate tar;
use std::fs::File;
use std::path::PathBuf;
use std::io::prelude::*;
@@ -1,8 +1,3 @@
extern crate cargotest;
extern crate libc;
#[cfg(windows)]
extern crate winapi;
use std::fs;
use std::io::{self, Read};
use std::net::TcpListener;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::support::{basic_bin_manifest, main_file, execs, project};
use hamcrest::{assert_that, existing_file};
@@ -1,10 +1,4 @@
#[macro_use]
extern crate cargotest;
extern crate hamcrest;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
use serde_json;
use std::collections::HashMap;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,7 +1,4 @@
extern crate cargotest;
extern crate hamcrest;
extern crate cargo;
use cargotest;
use std::str;
use std::fs::{self, File};
use std::io::Read;
@@ -1,7 +1,3 @@
#[macro_use]
extern crate cargotest;
extern crate hamcrest;
use std::fs::File;
use std::io::prelude::*;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::support::{project, execs};
use hamcrest::assert_that;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,8 +1,4 @@
extern crate cargo;
extern crate cargotest;
extern crate git2;
extern crate hamcrest;
use git2;
use std::fs::{self, File};
use std::io::prelude::*;
use std::net::{TcpListener, TcpStream};
@@ -1,8 +1,4 @@
extern crate cargotest;
extern crate cargo;
extern crate tempdir;
extern crate hamcrest;
use cargotest;
use std::fs::{self, File};
use std::io::prelude::*;
use std::env;
@@ -1,7 +1,4 @@
extern crate cargo;
extern crate cargotest;
extern crate hamcrest;
use cargotest;
use std::fs::{self, File, OpenOptions};
use std::io::prelude::*;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use std::net::TcpListener;
use std::thread;
use std::process::Command;
@@ -0,0 +1,82 @@
extern crate cargo;
#[macro_use]
extern crate cargotest;
extern crate hamcrest;
extern crate tempdir;
extern crate bufstream;
extern crate git2;
extern crate glob;
extern crate flate2;
extern crate tar;
extern crate libc;
#[cfg(windows)]
extern crate winapi;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
extern crate toml;
extern crate url;
mod alt_registry;
mod bad_config;
mod bad_manifest_path;
mod bench;
mod build_auth;
mod build_lib;
mod build;
mod build_script_env;
mod build_script;
mod cargo_alias_config;
mod cargo_features;
//mod cargo;
mod cfg;
mod check;
mod clean;
mod concurrent;
mod config;
mod cross_compile;
mod cross_publish;
mod death;
mod dep_info;
mod directory;
mod doc;
mod features;
mod fetch;
mod freshness;
mod generate_lockfile;
mod git;
mod init;
mod install;
mod jobserver;
mod local_registry;
mod lockfile_compat;
mod login;
mod metadata;
mod net_config;
mod new;
mod overrides;
mod package;
mod patch;
mod path;
mod plugins;
mod proc_macro;
mod profiles;
mod publish;
mod read_manifest;
mod registry;
mod required_features;
mod resolve;
mod run;
mod rustc;
mod rustdocflags;
mod rustdoc;
mod rustflags;
mod search;
mod small_fd_limits;
mod test;
mod tool_paths;
mod verify_project;
mod version;
mod warn_on_failure;
mod workspaces;
@@ -1,7 +1,3 @@
#[macro_use]
extern crate cargotest;
extern crate hamcrest;
use std::fs::{self, File};
use std::io::prelude::*;
@@ -1,6 +1,3 @@
extern crate cargotest;
extern crate hamcrest;
use cargotest::support::git;
use cargotest::support::registry::Package;
use cargotest::support::{execs, project, lines_match};
@@ -1,12 +1,7 @@
#[macro_use]
extern crate cargotest;
extern crate cargo;
extern crate hamcrest;
extern crate toml;
use std::io::prelude::*;
use std::fs::{self, File};
use toml;
use cargotest::{ChannelChanger, cargo_process};
use cargotest::support::execs;
use cargotest::support::registry::registry;
Oops, something went wrong.

0 comments on commit c2ff988

Please sign in to comment.