diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-28 17:39:45 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-12-30 22:42:32 +1100 |
| commit | 277ca706eb3dd793463f951a919763e2432d53e5 (patch) | |
| tree | 2d2fb18bfb73737fbafb65d93e9c019b4d511bb3 /test | |
| parent | 8a1c7639426c2ceee562674adde85dd9a5b46127 (diff) | |
migrate fetchPrune integration test
Diffstat (limited to 'test')
31 files changed, 0 insertions, 117 deletions
diff --git a/test/integration/fetchPrune/config/config.yml b/test/integration/fetchPrune/config/config.yml deleted file mode 100644 index a77fb48ed..000000000 --- a/test/integration/fetchPrune/config/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -disableStartupPopups: true -git: - autoFetch: false -gui: - theme: - activeBorderColor: - - green - - bold - SelectedRangeBgcolor: - - reverse diff --git a/test/integration/fetchPrune/expected/origin/HEAD b/test/integration/fetchPrune/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/fetchPrune/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/fetchPrune/expected/origin/config b/test/integration/fetchPrune/expected/origin/config deleted file mode 100644 index 4caf7663f..000000000 --- a/test/integration/fetchPrune/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/fetchPrune/actual/./repo diff --git a/test/integration/fetchPrune/expected/origin/description b/test/integration/fetchPrune/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/fetchPrune/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/fetchPrune/expected/origin/info/exclude b/test/integration/fetchPrune/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/fetchPrune/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differdeleted file mode 100644 index 7f2ebf4ee..000000000 --- a/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 +++ /dev/null diff --git a/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 deleted file mode 100644 index 965fc5498..000000000 --- a/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9ɤI cL!R"~ H|*x\ -b0H
J w nЏkKnvdJ"#wG=&]ξu2,
\ No newline at end of file diff --git a/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/fetchPrune/expected/origin/packed-refs b/test/integration/fetchPrune/expected/origin/packed-refs deleted file mode 100644 index 37e4528a7..000000000 --- a/test/integration/fetchPrune/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 refs/heads/master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 3829ab872..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile1 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 800c8511d..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 branch 'master' of ../origin diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/config b/test/integration/fetchPrune/expected/repo/.git_keep/config deleted file mode 100644 index 957eae48a..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/config +++ /dev/null @@ -1,21 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[fetch] - prune = true -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[branch "other_branch"] - remote = origin - merge = refs/heads/other_branch diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/description b/test/integration/fetchPrune/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/index b/test/integration/fetchPrune/expected/repo/.git_keep/index Binary files differdeleted file mode 100644 index 6955ab197..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/index +++ /dev/null diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude b/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 639cde24f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 commit (initial): myfile1 -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 checkout: moving from master to other_branch -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 checkout: moving from other_branch to master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f44229efe..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 commit (initial): myfile1 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 01e383d7f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 branch: Created from HEAD diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 7fe249171..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI <CI@example.com> 1648352761 +1100 fetch origin: storing head diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differdeleted file mode 100644 index 7f2ebf4ee..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 +++ /dev/null diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 deleted file mode 100644 index 965fc5498..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9ɤI cL!R"~ H|*x\ -b0H
J w nЏkKnvdJ"#wG=&]ξu2,
\ No newline at end of file diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs b/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/myfile1 b/test/integration/fetchPrune/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/fetchPrune/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/fetchPrune/recording.json b/test/integration/fetchPrune/recording.json deleted file mode 100644 index b24cbf0cb..000000000 --- a/test/integration/fetchPrune/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":608,"Mod":0,"Key":256,"Ch":102},{"Timestamp":1568,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
\ No newline at end of file diff --git a/test/integration/fetchPrune/setup.sh b/test/integration/fetchPrune/setup.sh deleted file mode 100644 index 87829a2e3..000000000 --- a/test/integration/fetchPrune/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -# we're setting this to ensure that it's honoured by the fetch command -git config fetch.prune true - -echo test1 > myfile1 -git add . -git commit -am "myfile1" - -git checkout -b other_branch -git checkout master - -cd .. -git clone --bare ./repo origin - -cd repo - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git branch --set-upstream-to=origin/other_branch other_branch - -# unbenownst to our test repo we're removing the branch on the remote, so upon -# fetching with prune: true we expect git to realise the remote branch is gone -git -C ../origin branch -d other_branch diff --git a/test/integration/fetchPrune/test.json b/test/integration/fetchPrune/test.json deleted file mode 100644 index 3d696e153..000000000 --- a/test/integration/fetchPrune/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "fetch from the remote with the 'prune' option set in the git config. Note this has a false positive until we find a way to show ls-remote origin in all tests when creating snapshots.", - "speed": 10 -} |