Merge net_traits and net_traits_tests

Cargo.lock

@@ -1975,13 +1975,6 @@ dependencies = [
  "webrender_api 0.56.1 (git+https://github.com/servo/webrender)",
 ]
 
-[[package]]
-name = "net_traits_tests"
-version = "0.0.1"
-dependencies = [
- "net_traits 0.0.1",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.12"

components/net_traits/Cargo.toml

@@ -8,6 +8,8 @@ publish = false
 [lib]
 name = "net_traits"
 path = "lib.rs"
+test = false
+doctest = false
 
 [dependencies]
 cookie = "0.10"

components/net_traits/tests/image.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+extern crate net_traits;
+
 use net_traits::image::base::detect_image_format;
 
 #[test]

components/net_traits/tests/pub_domains.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+extern crate net_traits;
+
 use net_traits::pub_domains::{is_pub_domain, is_reg_domain, pub_suffix, reg_suffix};
 
 // These tests may need to be updated if the PSL changes.

components/net_traits/tests/whitespace.rs

@@ -2,13 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![cfg(test)]
-
 extern crate net_traits;
 
-mod image;
-mod pub_domains;
-
 #[test]
 fn test_trim_http_whitespace() {
     fn test_trim(in_: &[u8], out: &[u8]) {

python/servo/testing_commands.py

@@ -231,7 +231,7 @@ class MachCommands(CommandBase):
             else:
                 test_patterns.append(test)
 
-        self_contained_tests = ["gfx", "layout", "msg", "net", "selectors"]
+        self_contained_tests = ["gfx", "layout", "msg", "net", "net_traits", "selectors"]
         if not packages:
             packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
             packages |= set(self_contained_tests)

tests/unit/net_traits/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "net_traits_tests"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-
-[lib]
-name = "net_traits_tests"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-net_traits = {path = "../../../components/net_traits"}