From e98c3cc5fad75bea038dc67238e5ce85d701b1e1 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 20 Dec 2012 02:50:52 +0900
Subject: fix broken tests

---
 src/leap/base/constants.py            | 33 +++++++++++++++++++++------------
 src/leap/base/tests/test_providers.py |  3 ++-
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/leap/base')

diff --git a/src/leap/base/constants.py b/src/leap/base/constants.py
index f7be8d98..b38723be 100644
--- a/src/leap/base/constants.py
+++ b/src/leap/base/constants.py
@@ -14,18 +14,27 @@ DEFAULT_PROVIDER = __branding.get(
 DEFINITION_EXPECTED_PATH = "provider.json"
 
 DEFAULT_PROVIDER_DEFINITION = {
-    u'api_uri': u'https://api.%s/' % DEFAULT_PROVIDER,
-    u'api_version': u'0.1.0',
-    u'ca_cert_fingerprint': u'8aab80ae4326fd30721689db813733783fe0bd7e',
-    u'ca_cert_uri': u'https://%s/cacert.pem' % DEFAULT_PROVIDER,
-    u'description': {u'en': u'This is a test provider'},
-    u'display_name': {u'en': u'Test Provider'},
-    u'domain': u'%s' % DEFAULT_PROVIDER,
-    u'enrollment_policy': u'open',
-    u'public_key': u'cb7dbd679f911e85bc2e51bd44afd7308ee19c21',
-    u'serial': 1,
-    u'services': [u'eip'],
-    u'version': u'0.1.0'}
+    u"api_uri": "https://api.%s/" % DEFAULT_PROVIDER,
+    u"api_version": u"1",
+    u"ca_cert_fingerprint": "SHA256: fff",
+    u"ca_cert_uri": u"https://%s/ca.crt" % DEFAULT_PROVIDER,
+    u"default_language": u"en",
+    u"description": {
+        u"en": u"A demonstration service provider using the LEAP platform"
+    },
+    u"domain": "%s" % DEFAULT_PROVIDER,
+    u"enrollment_policy": u"open",
+    u"languages": [
+        u"en"
+    ],
+    u"name": {
+        u"en": u"Test Provider"
+    },
+    u"services": [
+        "openvpn"
+    ]
+}
+
 
 MAX_ICMP_PACKET_LOSS = 10
 
diff --git a/src/leap/base/tests/test_providers.py b/src/leap/base/tests/test_providers.py
index 8801a3eb..9c11f270 100644
--- a/src/leap/base/tests/test_providers.py
+++ b/src/leap/base/tests/test_providers.py
@@ -90,7 +90,8 @@ class TestLeapProviderDefinition(BaseLeapTest):
     def test_provider_validation(self):
         self.definition.validate(self.config)
         _config = copy.deepcopy(self.config)
-        _config['serial'] = 'aaa'
+        # bad type, raise validation error
+        _config['domain'] = 111
         with self.assertRaises(jsonschema.ValidationError):
             self.definition.validate(_config)
 
-- 
cgit v1.2.3