forked from quay/clair
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gitutil: Fix git pull on non-git repository directory
* Add conditional check: if the git repo directory is newly created, we clone. * Add tests Fixes quay#641
- Loading branch information
1 parent
17539bd
commit ba0584e
Showing
2 changed files
with
79 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
// Copyright 2018 clair authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package gitutil | ||
|
||
import ( | ||
"io/ioutil" | ||
"os" | ||
"os/exec" | ||
"strings" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func createTemporaryGitRepo(t *testing.T) string { | ||
// create temporary folder | ||
path, err := ioutil.TempDir(os.TempDir(), "1b750a87bbfc") | ||
require.Nil(t, err) | ||
|
||
// initialize git | ||
cmd := exec.Command("git", "init", path) | ||
out, err := cmd.CombinedOutput() | ||
require.Nil(t, err, "Failed to initialize temporary git repo, output=%s", string(out)) | ||
return path | ||
} | ||
|
||
func createEmptyCommit(t *testing.T, repoPath string) { | ||
// create empty commit | ||
cmd := exec.Command("git", "commit", "-m", "\"init\"", "--allow-empty") | ||
cmd.Dir = repoPath | ||
out, err := cmd.CombinedOutput() | ||
require.Nil(t, err, "Failed to submit first empty git commit, output=%s", string(out)) | ||
} | ||
|
||
func getHeadCommitRev(t *testing.T, repoPath string) string { | ||
// get head | ||
cmd := exec.Command("git", "rev-parse", "HEAD") | ||
cmd.Dir = repoPath | ||
out, err := cmd.CombinedOutput() | ||
require.Nil(t, err, "Failed to get head revision, output=%s", string(out)) | ||
return strings.TrimSuffix(string(out), "\n") | ||
} | ||
|
||
func TestCloneOrPull(t *testing.T) { | ||
remote := createTemporaryGitRepo(t) | ||
createEmptyCommit(t, remote) | ||
expectedHead := getHeadCommitRev(t, remote) | ||
t.Log(expectedHead) | ||
repoPath := "" | ||
tempDirPrefix := "9c2d4181" | ||
path, head, err := CloneOrPull(remote, repoPath, tempDirPrefix) | ||
require.Nil(t, err) | ||
_, err = os.Stat(path) | ||
require.Nil(t, err, "Expect generated repo to exist") | ||
require.Equal(t, expectedHead, head) | ||
|
||
// create second empty commit to try pull | ||
createEmptyCommit(t, remote) | ||
expectedHead = getHeadCommitRev(t, remote) | ||
t.Log(expectedHead) | ||
path, head, err = CloneOrPull(remote, repoPath, tempDirPrefix) | ||
require.Nil(t, err) | ||
_, err = os.Stat(path) | ||
require.Nil(t, err, "Expect generated repo to exist") | ||
require.Equal(t, expectedHead, head) | ||
} |