Skip to content

Add License test to verify correct MQ license - 9.0.5-dev #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2018
Merged

Add License test to verify correct MQ license - 9.0.5-dev #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ test-unit:
.PHONY: test-advancedserver
test-advancedserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)

.PHONY: build-devjmstest
build-devjmstest:
Expand All @@ -154,7 +154,7 @@ build-devjmstest:
.PHONY: test-devserver
test-devserver: test/docker/vendor build-devjmstest
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on Docker"$(END)))
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) EXPECTED_LICENSE=Developer go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)

.PHONY: test-advancedserver-cover
test-advancedserver-cover: test/docker/vendor
Expand Down
31 changes: 31 additions & 0 deletions test/docker/docker_api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"encoding/json"
"fmt"
"io"
"os"
"path/filepath"
"regexp"
"runtime"
Expand Down Expand Up @@ -596,3 +597,33 @@ func TestMQJSONDisabled(t *testing.T) {
// JSON logs to appear)
stopContainer(t, cli, id)
}

func TestCorrectLicense(t *testing.T) {
t.Parallel()

//Check we have the license set
expectedLicense, ok := os.LookupEnv("EXPECTED_LICENSE")
if !ok {
t.Fatal("Required test environment variable 'EXPECTED_LICENSE' was not set.")
}

cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
}

containerConfig := container.Config{
Env: []string{"LICENSE=accept"},
}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)

rc, license := execContainer(t, cli, id, "mqm", []string{"dspmqver", "-f", "8192", "-b"})
if rc != 0 {
t.Fatalf("Failed to get license string. RC=%d. Output=%s", rc, license)
}

if license != expectedLicense {
t.Errorf("Expected license to be '%s' but was '%s", expectedLicense, license)
}
}