Commit fc6f044ea3963eeee1a422de18c04fb29a2541fb
2015-04-21T20:02:24
Fix for Issue #3023 tests fail with no network Moved offending tests from network to online so they will get skipped when there is a lack of network connectivity: -test_online_remotes__single_branch -test_online_remotes__restricted_refspecs
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 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
diff --git a/tests/network/remote/remotes.c b/tests/network/remote/remotes.c
index e750f7b..3e6e438 100644
--- a/tests/network/remote/remotes.c
+++ b/tests/network/remote/remotes.c
@@ -513,24 +513,6 @@ void test_network_remote_remotes__query_refspecs(void)
git_remote_free(remote);
}
-static int remote_single_branch(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload)
-{
- char *fetch_refspecs[] = {
- "refs/heads/first-merge:refs/remotes/origin/first-merge",
- };
- git_strarray fetch_refspecs_strarray = {
- fetch_refspecs,
- 1,
- };
-
- GIT_UNUSED(payload);
-
- cl_git_pass(git_remote_create(out, repo, name, url));
- cl_git_pass(git_remote_set_fetch_refspecs(*out, &fetch_refspecs_strarray));
-
- return 0;
-}
-
void test_network_remote_remotes__fetch_from_anonymous(void)
{
git_remote *remote;
@@ -540,36 +522,3 @@ void test_network_remote_remotes__fetch_from_anonymous(void)
cl_git_pass(git_remote_fetch(remote, NULL, NULL));
git_remote_free(remote);
}
-
-void test_network_remote_remotes__single_branch(void)
-{
- git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
- git_repository *repo;
- git_strarray refs;
- size_t i, count = 0;
-
- opts.remote_cb = remote_single_branch;
- opts.checkout_branch = "first-merge";
-
- cl_git_pass(git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./single-branch", &opts));
- cl_git_pass(git_reference_list(&refs, repo));
-
- for (i = 0; i < refs.count; i++) {
- if (!git__prefixcmp(refs.strings[i], "refs/heads/"))
- count++;
- }
- cl_assert_equal_i(1, count);
-
- git_strarray_free(&refs);
- git_repository_free(repo);
-}
-
-void test_network_remote_remotes__restricted_refspecs(void)
-{
- git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
- git_repository *repo;
-
- opts.remote_cb = remote_single_branch;
-
- cl_git_fail_with(GIT_EINVALIDSPEC, git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./restrict-refspec", &opts));
-}
diff --git a/tests/online/remotes.c b/tests/online/remotes.c
new file mode 100644
index 0000000..70374be
--- /dev/null
+++ b/tests/online/remotes.c
@@ -0,0 +1,52 @@
+#include "clar_libgit2.h"
+
+static int remote_single_branch(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload)
+{
+ char *fetch_refspecs[] = {
+ "refs/heads/first-merge:refs/remotes/origin/first-merge",
+ };
+ git_strarray fetch_refspecs_strarray = {
+ fetch_refspecs,
+ 1,
+ };
+
+ GIT_UNUSED(payload);
+
+ cl_git_pass(git_remote_create(out, repo, name, url));
+ cl_git_pass(git_remote_set_fetch_refspecs(*out, &fetch_refspecs_strarray));
+
+ return 0;
+}
+
+void test_online_remotes__single_branch(void)
+{
+ git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
+ git_repository *repo;
+ git_strarray refs;
+ size_t i, count = 0;
+
+ opts.remote_cb = remote_single_branch;
+ opts.checkout_branch = "first-merge";
+
+ cl_git_pass(git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./single-branch", &opts));
+ cl_git_pass(git_reference_list(&refs, repo));
+
+ for (i = 0; i < refs.count; i++) {
+ if (!git__prefixcmp(refs.strings[i], "refs/heads/"))
+ count++;
+ }
+ cl_assert_equal_i(1, count);
+
+ git_strarray_free(&refs);
+ git_repository_free(repo);
+}
+
+void test_online_remotes__restricted_refspecs(void)
+{
+ git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
+ git_repository *repo;
+
+ opts.remote_cb = remote_single_branch;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./restrict-refspec", &opts));
+}