tests pass after branding changes

3 files changed, 32 insertions, 12 deletions

diff --git a/src/leap/eip/tests/data.py b/src/leap/eip/tests/data.py
index 284b398f..4da0e18f 100644
--- a/src/leap/eip/tests/data.py
+++ b/src/leap/eip/tests/data.py
@@ -1,21 +1,25 @@
 from __future__ import unicode_literals
 import os
 
+from leap import __branding
+
 # sample data used in tests
 
+PROVIDER = __branding.get('provider_domain')
+
 EIP_SAMPLE_JSON = {
-    "provider": "testprovider.example.org",
+    "provider": "%s" % PROVIDER,
     "transport": "openvpn",
     "openvpn_protocol": "tcp",
     "openvpn_port": 80,
     "openvpn_ca_certificate": os.path.expanduser(
         "~/.config/leap/providers/"
-        "testprovider.example.org/"
-        "keys/ca/testprovider-ca-cert.pem"),
+        "%s/"
+        "keys/ca/testprovider-ca-cert.pem" % PROVIDER),
     "openvpn_client_certificate": os.path.expanduser(
         "~/.config/leap/providers/"
-        "testprovider.example.org/"
-        "keys/client/openvpn.pem"),
+        "%s/"
+        "keys/client/openvpn.pem" % PROVIDER),
     "connect_on_login": True,
     "block_cleartext_traffic": True,
     "primary_gateway": "usa_west",
diff --git a/src/leap/eip/tests/test_checks.py b/src/leap/eip/tests/test_checks.py
index 952b10d2..42aa9cce 100644
--- a/src/leap/eip/tests/test_checks.py
+++ b/src/leap/eip/tests/test_checks.py
@@ -331,10 +331,10 @@ class ProviderCertCheckerHTTPSTests(BaseHTTPSServerTestCase, BaseLeapTest):
             fetcher.get(uri, verify=True)
             self.assertTrue(
                 "SSL23_GET_SERVER_HELLO:unknown protocol" in exc.message)
-        with self.assertRaises(requests.exceptions.SSLError) as exc:
+        with self.assertRaises(eipexceptions.EIPBadCertError) as exc:
             checker.is_https_working(uri=uri, verify=True)
             self.assertTrue(
-                "SSL23_GET_SERVER_HELLO:unknown protocol" in exc.message)
+                "cert verification failed" in exc.message)
 
         # get cacert from testing.https_server
         cacert = where_cert('cacert.pem')
diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py
index 60300770..f9f963dc 100644
--- a/src/leap/eip/tests/test_config.py
+++ b/src/leap/eip/tests/test_config.py
@@ -1,3 +1,4 @@
+import json
 import os
 import platform
 import stat
@@ -9,11 +10,17 @@ except ImportError:
 
 #from leap.base import constants
 #from leap.eip import config as eip_config
+from leap import __branding as BRANDING
+from leap.eip import config as eipconfig
+from leap.eip.tests.data import EIP_SAMPLE_SERVICE
 from leap.testing.basetest import BaseLeapTest
 from leap.util.fileutil import mkdir_p
 
 _system = platform.system()
 
+PROVIDER = BRANDING.get('provider_domain')
+PROVIDER_SHORTNAME = BRANDING.get('short_name')
+
 
 class EIPConfigTest(BaseLeapTest):
 
@@ -39,6 +46,14 @@ class EIPConfigTest(BaseLeapTest):
         open(tfile, 'wb').close()
         os.chmod(tfile, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
 
+    def write_sample_eipservice(self):
+        conf = eipconfig.EIPConfig()
+        folder, f = os.path.split(conf.filename)
+        if not os.path.isdir(folder):
+            mkdir_p(folder)
+        with open(conf.filename, 'w') as fd:
+            fd.write(json.dumps(EIP_SAMPLE_SERVICE))
+
     def get_expected_openvpn_args(self):
         args = []
         username = self.get_username()
@@ -51,7 +66,7 @@ class EIPConfigTest(BaseLeapTest):
         args.append('--persist-tun')
         args.append('--persist-key')
         args.append('--remote')
-        args.append('testprovider.example.org')
+        args.append('%s' % eipconfig.get_eip_gateway())
         # XXX get port!?
         args.append('1194')
         # XXX get proto
@@ -80,23 +95,23 @@ class EIPConfigTest(BaseLeapTest):
         args.append(os.path.join(
             self.home,
             '.config', 'leap', 'providers',
-            'testprovider.example.org',
+            '%s' % PROVIDER,
             'keys', 'client',
             'openvpn.pem'))
         args.append('--key')
         args.append(os.path.join(
             self.home,
             '.config', 'leap', 'providers',
-            'testprovider.example.org',
+            '%s' % PROVIDER,
             'keys', 'client',
             'openvpn.pem'))
         args.append('--ca')
         args.append(os.path.join(
             self.home,
             '.config', 'leap', 'providers',
-            'testprovider.example.org',
+            '%s' % PROVIDER,
             'keys', 'ca',
-            'testprovider-ca-cert.pem'))
+            '%s-cacert.pem' % PROVIDER_SHORTNAME))
         return args
 
     # build command string
@@ -107,6 +122,7 @@ class EIPConfigTest(BaseLeapTest):
 
     def test_build_ovpn_command_empty_config(self):
         self.touch_exec()
+        self.write_sample_eipservice()
         from leap.eip import config as eipconfig
         from leap.util.fileutil import which
         path = os.environ['PATH']