From 5bc118fb6c7eb5bb3c80d4b68cabac0b81fbd02c Mon Sep 17 00:00:00 2001 From: MinRK Date: Wed, 10 Sep 2014 14:30:44 -0700 Subject: [PATCH] handle system-wide kernelspecs in html tets_kernelspecs_api, which can cause counts to be greater than 2 --- .../services/kernelspecs/tests/test_kernelspecs_api.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py b/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py index ad2a5fbdb..871f163bf 100644 --- a/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py +++ b/IPython/html/services/kernelspecs/tests/test_kernelspecs_api.py @@ -10,6 +10,7 @@ pjoin = os.path.join import requests +from IPython.kernel.kernelspec import NATIVE_KERNEL_NAME from IPython.html.utils import url_path_join from IPython.html.tests.launchnotebook import NotebookTestBase, assert_http_error @@ -70,12 +71,16 @@ class APITest(NotebookTestBase): assert isinstance(specs, list) # 2: the sample kernelspec created in setUp, and the native Python kernel - self.assertEqual(len(specs), 2) + self.assertGreaterEqual(len(specs), 2) def is_sample_kernelspec(s): return s['name'] == 'sample' and s['display_name'] == 'Test kernel' + def is_default_kernelspec(s): + return s['name'] == NATIVE_KERNEL_NAME and s['display_name'].startswith("IPython") + assert any(is_sample_kernelspec(s) for s in specs), specs + assert any(is_default_kernelspec(s) for s in specs), specs def test_get_kernelspec(self): spec = self.ks_api.kernel_spec_info('Sample').json() # Case insensitive