lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add test for cached locks, fix cached locks

Browse Source
This commit is contained in:
Steve Streeting 2016-12-12 14:56:40 +00:00
parent 3ea24f1647
commit f71598bc20
2 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locking/locks.go
View File

@ -178,12 +178,12 @@ func (c *Client) SearchLocks(filter map[string]string, limit int, localOnly bool
}
func (c *Client) searchCachedLocks(filter map[string]string, limit int) ([]Lock, error) {
locks := c.cachedLocks()
cachedlocks := c.cachedLocks()
path, filterByPath := filter["path"]
id, filterById := filter["id"]
lockCount := 0
for _, l := range locks {
locks := make([]Lock, 0, len(cachedlocks))
for _, l := range cachedlocks {
// Manually filter by Path/Id
if (filterByPath && path != l.Path) ||
(filterById && id != l.Id) {

45
test/test-locks.sh
View File

@ -88,3 +88,48 @@ begin_test "list locks with pagination"
grep "4 lock(s) matched query" locks.log
)
end_test
begin_test "cached locks"
(
set -e
reponame="cached_locks"
setup_remote_repo "remote_$reponame"
clone_repo "remote_$reponame" "clone_$reponame"
git lfs track "*.dat"
echo "foo" > "cached1.dat"
echo "bar" > "cached2.dat"
git add "cached1.dat" "cached2.dat" ".gitattributes"
git commit -m "add files" | tee commit.log
grep "3 files changed" commit.log
grep "create mode 100644 cached1.dat" commit.log
grep "create mode 100644 cached2.dat" commit.log
grep "create mode 100644 .gitattributes" commit.log
git push origin master 2>&1 | tee push.log
grep "master -> master" push.log
GITLFSLOCKSENABLED=1 git lfs lock "cached1.dat" | tee lock.log
assert_server_lock "$(grep -oh "\((.*)\)" lock.log | tr -d "()")"
GITLFSLOCKSENABLED=1 git lfs lock "cached2.dat" | tee lock.log
assert_server_lock "$(grep -oh "\((.*)\)" lock.log | tr -d "()")"
GITLFSLOCKSENABLED=1 git lfs locks --local | tee locks.log
grep "2 lock(s) matched query" locks.log
# delete the remote to prove we're using the local records
git remote remove origin
GITLFSLOCKSENABLED=1 git lfs locks --local --path "cached1.dat" | tee locks.log
grep "1 lock(s) matched query" locks.log
grep "cached1.dat" locks.log
GITLFSLOCKSENABLED=1 git lfs locks --local --limit 1 | tee locks.log
grep "1 lock(s) matched query" locks.log
)
end_test