Skip to content

Commit

Permalink
#120 Fix failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jelemux committed Jan 29, 2024
1 parent 8dab3dd commit 0a3cc27
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/com/cloudogu/ces/cesbuildlib/K3dTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class K3dTest extends GroovyTestCase {
void testStartK3d() {
def workspaceDir = "leWorkspace"
def k3dWorkspaceDir = "leK3dWorkSpace"
def k3dVer = "4.4.7"
def expectedK3dVer = "5.6.0"

def scriptMock = new ScriptMock()
scriptMock.expectedShRetValueForScript.put('echo -n $(python3 -c \'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()\');'.toString(), "54321")
Expand All @@ -98,7 +98,7 @@ class K3dTest extends GroovyTestCase {

assertThat(scriptMock.allActualArgs[0].trim()).isEqualTo("rm -rf ${k3dWorkspaceDir}/.k3d".toString())
assertThat(scriptMock.allActualArgs[1].trim()).isEqualTo("mkdir -p ${k3dWorkspaceDir}/.k3d/bin".toString())
assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v${k3dVer} K3D_INSTALL_DIR=${k3dWorkspaceDir}/.k3d/bin bash -s -- --no-sudo".toString())
assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v${expectedK3dVer} K3D_INSTALL_DIR=${k3dWorkspaceDir}/.k3d/bin bash -s -- --no-sudo".toString())
assertThat(scriptMock.allActualArgs[3].trim()).isEqualTo("echo -n \$(python3 -c 'import socket; s=socket.socket(); s.bind((\"\", 0)); print(s.getsockname()[1]); s.close()');")
assertThat(scriptMock.allActualArgs[4].trim()).matches("k3d registry create citest-[0-9a-f]+ --port 54321")
assertThat(scriptMock.allActualArgs[5].trim()).startsWith("k3d cluster create citest-")
Expand All @@ -124,7 +124,7 @@ class K3dTest extends GroovyTestCase {
void testStartK3dWithCustomCredentials() {
def workspaceDir = "leWorkspace"
def k3dWorkspaceDir = "path"
def k3dVer = "4.4.7"
def expectedK3dVer = "5.6.0"

def scriptMock = new ScriptMock()
scriptMock.expectedShRetValueForScript.put('echo -n $(python3 -c \'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()\');'.toString(), "54321")
Expand All @@ -135,7 +135,7 @@ class K3dTest extends GroovyTestCase {

assertThat(scriptMock.allActualArgs[0].trim()).isEqualTo("rm -rf ${k3dWorkspaceDir}/.k3d".toString())
assertThat(scriptMock.allActualArgs[1].trim()).isEqualTo("mkdir -p ${k3dWorkspaceDir}/.k3d/bin".toString())
assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v${k3dVer} K3D_INSTALL_DIR=${k3dWorkspaceDir}/.k3d/bin bash -s -- --no-sudo".toString())
assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v${expectedK3dVer} K3D_INSTALL_DIR=${k3dWorkspaceDir}/.k3d/bin bash -s -- --no-sudo".toString())
assertThat(scriptMock.allActualArgs[3].trim()).isEqualTo("echo -n \$(python3 -c 'import socket; s=socket.socket(); s.bind((\"\", 0)); print(s.getsockname()[1]); s.close()');")
assertThat(scriptMock.allActualArgs[4].trim()).matches("k3d registry create citest-[0-9a-f]+ --port 54321")
assertThat(scriptMock.allActualArgs[5].trim()).startsWith("k3d cluster create citest-")
Expand Down

0 comments on commit 0a3cc27

Please sign in to comment.