Fix tests and test provider for real license format

util/config/provider/testprovider.py

@@ -1,21 +1,22 @@
 import json
 import io
+from datetime import datetime, timedelta
 
 from util.config.provider.baseprovider import BaseProvider
+from util.license import (EntitlementValidationResult, Entitlement, Expiration, ExpirationType,
+                          EntitlementRequirement)
 
 REAL_FILES = ['test/data/signing-private.gpg', 'test/data/signing-public.gpg']
 
 class TestLicense(object):
-  @property
-  def subscription(self):
-    return {}
-
-  @property
-  def is_expired(self):
-    return False
+  def validate_entitlement_requirement(self, entitlement_req, check_time):
+    expiration = Expiration(ExpirationType.license_wide, datetime.now() + timedelta(days=31))
+    entitlement = Entitlement('fake', 0, 'someprod', expiration)
+    fakereq = EntitlementRequirement('fake', 0)
+    return EntitlementValidationResult(fakereq, datetime.now(), entitlement)
 
   def validate(self, config):
-    pass
+    return [self.validate_entitlement_requirement(None, None)]
 
 class TestConfigProvider(BaseProvider):
   """ Implementation of the config provider for testing. Everything is kept in-memory instead on

util/license.py

@@ -220,7 +220,6 @@ class License(object):
     # We assume monthly license unless specified otherwise
     return Expiration(ExpirationType.monthly, service_end, MONTHLY_GRACE_PERIOD)
 
-
   def validate(self, config):
     """ Returns a list of EntitlementValidationResult objects, one per requirement.
     """
@@ -284,8 +283,10 @@ class LicenseValidator(Thread):
   synchronization primitive.
   """
   def __init__(self, config_provider, *args, **kwargs):
+    config = config_provider.get_config() or {}
+
     self._config_provider = config_provider
-    self._entitlement_requirements = _gen_entitlement_requirements(config_provider.get_config())
+    self._entitlement_requirements = _gen_entitlement_requirements(config)
 
     # multiprocessing.Value does not ensure consistent write-after-reads, but we don't need that.
     self._license_is_insufficient = multiprocessing.Value(c_bool, True)