From 93e2b428686556f172ea5f6d0d655a5bd477a591 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Thu, 11 Mar 2021 17:41:06 +1100 Subject: [PATCH] chore: update tests for new osx paths --- v3/installer/installer.go | 3 ++- v3/installer/installer_test.go | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/v3/installer/installer.go b/v3/installer/installer.go index 19cd40d4f..472b5f84c 100644 --- a/v3/installer/installer.go +++ b/v3/installer/installer.go @@ -209,7 +209,8 @@ func (i *Installer) getLibDstForPackage(pkg string) (string, error) { } var setOSXInstallName = func(file string, lib string) error { - cmd := exec.Command("install_name_tool", "-id", fmt.Sprintf("../../libs/%s.dylib", lib), file) + cmd := exec.Command("install_name_tool", "-id", fmt.Sprintf("/opt/pact/%s.dylib", lib), file) + // cmd := exec.Command("install_name_tool", "-id", fmt.Sprintf("../../libs/%s.dylib", lib), file) stdoutStderr, err := cmd.CombinedOutput() if err != nil { diff --git a/v3/installer/installer_test.go b/v3/installer/installer_test.go index 2477110d8..a76378fa5 100644 --- a/v3/installer/installer_test.go +++ b/v3/installer/installer_test.go @@ -25,7 +25,7 @@ func TestInstallerDownloader(t *testing.T) { { name: "mock server - linux x86", pkg: mockServerPackage, - want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.14/libpact_mock_server_ffi-linux-x86_64.so.gz", + want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.15/libpact_mock_server_ffi-linux-x86_64.so.gz", test: Installer{ os: linux, arch: x86_64, @@ -34,7 +34,7 @@ func TestInstallerDownloader(t *testing.T) { { name: "mock server - osx x86", pkg: mockServerPackage, - want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.14/libpact_mock_server_ffi-osx-x86_64.dylib.gz", + want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.15/libpact_mock_server_ffi-osx-x86_64.dylib.gz", test: Installer{ os: osx, arch: x86_64, @@ -43,7 +43,7 @@ func TestInstallerDownloader(t *testing.T) { { name: "mock server - linux x86", pkg: mockServerPackage, - want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.14/libpact_mock_server_ffi-windows-x86_64.dll.gz", + want: "https://github.com/pact-foundation/pact-reference/releases/download/libpact_mock_server_ffi-v0.0.15/libpact_mock_server_ffi-windows-x86_64.dll.gz", test: Installer{ os: windows, arch: x86_64, @@ -90,14 +90,16 @@ func TestInstallerDownloader(t *testing.T) { }, mockServerPackage: { libName: "libpact_mock_server_ffi", - version: "0.0.14", - semverRange: ">= 0.0.14, < 1.0.0", + version: "0.0.15", + semverRange: ">= 0.0.15, < 1.0.0", testCommand: func() string { return "0.0.13" }, }, } + // TODO: + }) t.Run("errors if installed versions are out of date", func(t *testing.T) {