Revert changes to TestJson

Sdoof · Apr 23, 2016 · d88add6 · d88add6
1 parent b139230
commit d88add6
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -57,11 +57,6 @@ def test_pip_style(self):
 
 
 class TestJson(unittest.TestCase):
-    def __init__(self, *args, **kwargs):
-        config.rc = config.load_condarc(config.rc_path)
-        config.rc['add_binstar_token'] = False
-        super(TestJson, self).__init__(*args, **kwargs)
-
     def assertJsonSuccess(self, res):
         self.assertIsInstance(res, dict)
         self.assertIn('success', res)
@@ -143,15 +138,15 @@ def test_config(self):
 
     @pytest.mark.slow
     def test_info(self):
-        res = capture_json_with_argv('conda', 'info', '--json', relaxed=True)
+        res = capture_json_with_argv('conda', 'info', '--json')
         keys = ('channels', 'conda_version', 'default_prefix', 'envs',
                 'envs_dirs', 'is_foreign', 'pkgs_dirs', 'platform',
                 'python_version', 'rc_path', 'root_prefix', 'root_writable')
         self.assertIsInstance(res, dict)
         for key in keys:
             assert key in res
 
-        res = capture_json_with_argv('conda', 'info', 'conda', '--json', relaxed=True)
+        res = capture_json_with_argv('conda', 'info', 'conda', '--json')
         self.assertIsInstance(res, dict)
         self.assertIn('conda', res)
         self.assertIsInstance(res['conda'], list)