From 7a6005f37b7c886fdde3212100eb30be31505b95 Mon Sep 17 00:00:00 2001
From: Mark Thomas <mbthomas@fb.com>
Date: Tue, 10 Sep 2019 09:03:03 -0700
Subject: [PATCH] extract derive_unode_manifest test_utils to a test crate

Summary:
Extract the test utils from derive_unode_manifest to their own crate so that
they can be re-used in future tests.

Reviewed By: StanislavGlebik

Differential Revision: D17282411

fbshipit-source-id: 50410cffe8a912bd07283bc6ac4e97e28663d854
---
 manifest/derive_unode_manifest/derived_data_unodes.rs        | 2 +-
 manifest/derive_unode_manifest/lib.rs                        | 5 +----
 .../test_utils.rs => test_utils/lib.rs}                      | 0
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename manifest/{derive_unode_manifest/test_utils.rs => test_utils/lib.rs} (100%)

diff --git a/manifest/derive_unode_manifest/derived_data_unodes.rs b/manifest/derive_unode_manifest/derived_data_unodes.rs
index d03e0fe698..1460773f46 100644
--- a/manifest/derive_unode_manifest/derived_data_unodes.rs
+++ b/manifest/derive_unode_manifest/derived_data_unodes.rs
@@ -142,7 +142,6 @@ pub(crate) fn get_file_changes(
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::test_utils::iterate_all_entries;
     use bookmarks::BookmarkName;
     use cloned::cloned;
     use fixtures::{
@@ -153,6 +152,7 @@ mod test {
     use mercurial_types::{Changeset, HgChangesetId, HgManifestId};
     use revset::AncestorsNodeStream;
     use std::sync::Arc;
+    use test_utils::iterate_all_entries;
     use tokio::runtime::Runtime;
 
     fn fetch_manifest_by_cs_id(
diff --git a/manifest/derive_unode_manifest/lib.rs b/manifest/derive_unode_manifest/lib.rs
index 97b54f5128..920d5864bc 100644
--- a/manifest/derive_unode_manifest/lib.rs
+++ b/manifest/derive_unode_manifest/lib.rs
@@ -28,9 +28,6 @@ use std::collections::BTreeMap;
 pub mod derived_data_unodes;
 pub use derived_data_unodes::{RootUnodeManifestId, RootUnodeManifestMapping};
 
-#[cfg(test)]
-mod test_utils;
-
 #[derive(Debug, Fail)]
 pub enum ErrorKind {
     #[fail(display = "cannot fetch FileUnode: {}", _0)]
@@ -300,7 +297,6 @@ fn return_if_unique_filenode(unodes: &Vec<FileUnode>) -> Option<(&ContentId, &Fi
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::{get_bonsai_changeset, iterate_all_entries};
     use blobrepo::save_bonsai_changesets;
     use blobrepo_factory::new_memblob_empty;
     use blobstore::Storable;
@@ -316,6 +312,7 @@ mod tests {
         RepoPath,
     };
     use std::collections::{HashSet, VecDeque};
+    use test_utils::{get_bonsai_changeset, iterate_all_entries};
     use tokio::runtime::Runtime;
 
     #[test]
diff --git a/manifest/derive_unode_manifest/test_utils.rs b/manifest/test_utils/lib.rs
similarity index 100%
rename from manifest/derive_unode_manifest/test_utils.rs
rename to manifest/test_utils/lib.rs