Commit 922dd9788cfec2ec4727e1b264a2ad6a7f4849ba
2013-01-02T13:54:37
Move some clone tests to the nonetwork suite
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/tests-clar/clone/network.c b/tests-clar/clone/network.c
index 8850987..f3b9672 100644
--- a/tests-clar/clone/network.c
+++ b/tests-clar/clone/network.c
@@ -61,14 +61,6 @@ void test_clone_network__network_bare(void)
git_remote_free(origin);
}
-void test_clone_network__cope_with_already_existing_directory(void)
-{
- cl_set_cleanup(&cleanup_repository, "./foo");
-
- p_mkdir("./foo", GIT_DIR_MODE);
- cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options));
-}
-
void test_clone_network__empty_repository(void)
{
git_reference *head;
@@ -87,20 +79,6 @@ void test_clone_network__empty_repository(void)
git_reference_free(head);
}
-void test_clone_network__can_prevent_the_checkout_of_a_standard_repo(void)
-{
- git_buf path = GIT_BUF_INIT;
- cl_set_cleanup(&cleanup_repository, "./foo");
-
- g_options.checkout_opts.checkout_strategy = 0;
- cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options));
-
- cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt"));
- cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path)));
-
- git_buf_free(&path);
-}
-
static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload)
{
bool *was_called = (bool*)payload;
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index 51fedab..ffcf03d 100644
--- a/tests-clar/clone/nonetwork.c
+++ b/tests-clar/clone/nonetwork.c
@@ -160,3 +160,25 @@ void test_clone_nonetwork__custom_autotag(void)
cl_assert_equal_i(0, tags.count);
}
+void test_clone_nonetwork__cope_with_already_existing_directory(void)
+{
+ cl_set_cleanup(&cleanup_repository, "./foo");
+
+ p_mkdir("./foo", GIT_DIR_MODE);
+ cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
+}
+
+void test_clone_nonetwork__can_prevent_the_checkout_of_a_standard_repo(void)
+{
+ git_buf path = GIT_BUF_INIT;
+ cl_set_cleanup(&cleanup_repository, "./foo");
+
+ g_options.checkout_opts.checkout_strategy = 0;
+ cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
+
+ cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt"));
+ cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path)));
+
+ git_buf_free(&path);
+}
+