From 2bf81a9f092f03d87f492bdf50699ac90c231826 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 20 Jul 2016 17:32:57 -0400 Subject: EE: Don't enforce start date on licenses (#3645) --- utils/license.go | 2 +- utils/license_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/license.go b/utils/license.go index 1b908a599..85d25e6ab 100644 --- a/utils/license.go +++ b/utils/license.go @@ -49,7 +49,7 @@ func LoadLicense(licenseBytes []byte) { func SetLicense(license *model.License) bool { license.Features.SetDefaults() - if !license.IsExpired() && license.IsStarted() { + if !license.IsExpired() { License = license IsLicensed = true ClientLicense = getClientLicense(license) diff --git a/utils/license_test.go b/utils/license_test.go index 237ee5fb2..d85d59dcf 100644 --- a/utils/license_test.go +++ b/utils/license_test.go @@ -32,8 +32,8 @@ func TestSetLicense(t *testing.T) { l3.Customer = &model.Customer{} l3.StartsAt = model.GetMillis() + 10000 l3.ExpiresAt = model.GetMillis() + 100000 - if ok := SetLicense(l3); ok { - t.Fatal("license should have failed") + if ok := SetLicense(l3); !ok { + t.Fatal("license should have passed") } } -- cgit v1.2.3-1-g7c22