Fixed tests

Jguer · May 13, 2024 · 7a4f812 · 7a4f812
1 parent 5f0ec2c
commit 7a4f812
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/local_install_test.go b/local_install_test.go
@@ -73,6 +73,7 @@ func TestIntegrationLocalInstall(t *testing.T) {
 
 	wantCapture := []string{
 		"makepkg --packagelist",
+		"git -C testdata/jfin branch --show-current",
 		"git -C testdata/jfin git reset --hard HEAD",
 		"git -C testdata/jfin git merge --no-edit --ff",
 		"makepkg --packagelist",
@@ -337,6 +338,7 @@ func TestIntegrationLocalInstallNeeded(t *testing.T) {
 
 	wantCapture := []string{
 		"makepkg --packagelist",
+		"git -C testdata/jfin branch --show-current",
 		"git -C testdata/jfin git reset --hard HEAD",
 		"git -C testdata/jfin git merge --no-edit --ff",
 		"makepkg --packagelist",
@@ -510,6 +512,7 @@ func TestIntegrationLocalInstallGenerateSRCINFO(t *testing.T) {
 	wantCapture := []string{
 		"makepkg --printsrcinfo",
 		"makepkg --packagelist",
+		"git -C testdata/jfin branch --show-current",
 		"git -C testdata/jfin git reset --hard HEAD",
 		"git -C testdata/jfin git merge --no-edit --ff",
 		"makepkg --packagelist",
@@ -795,6 +798,7 @@ func TestIntegrationLocalInstallWithDepsProvides(t *testing.T) {
 	}
 
 	wantCapture := []string{
+		"git -C testdata/cephbin branch --show-current",
 		"git -C testdata/cephbin git reset --hard HEAD",
 		"git -C testdata/cephbin git merge --no-edit --ff",
 		"makepkg --packagelist",
@@ -923,8 +927,10 @@ func TestIntegrationLocalInstallTwoSrcInfosWithDeps(t *testing.T) {
 	}
 
 	wantCapture := []string{
+		"git -C testdata/gourou branch --show-current",
 		"git -C testdata/gourou git reset --hard HEAD",
 		"git -C testdata/gourou git merge --no-edit --ff",
+		"git -C testdata/libzip-git branch --show-current",
 		"git -C testdata/libzip-git git reset --hard HEAD",
 		"git -C testdata/libzip-git git merge --no-edit --ff",
 		"makepkg --packagelist",

diff --git a/sync_test.go b/sync_test.go
@@ -545,6 +545,7 @@ pkgname = python-vosk
 	require.NoError(t, err)
 
 	wantCapture := []string{
+		"/usr/bin/git -C testdata/vosk-api branch --show-current",
 		"/usr/bin/git -C /testdir/vosk-api reset --hard HEAD",
 		"/usr/bin/git -C /testdir/vosk-api merge --no-edit --ff",
 		"makepkg --packagelist", "makepkg --packagelist",