🔧 Cleanup test_plot.py.

Author: theengineear

plotly/tests/test_core/test_plotly/test_plot.py

@@ -11,27 +11,23 @@
 import six
 from requests.compat import json as _json
 
-from unittest import TestCase
 from mock import patch
 from nose.plugins.attrib import attr
-from nose.tools import raises
 
 import plotly.tools as tls
+from plotly import session
 from plotly.tests.utils import PlotlyTestCase
 from plotly.plotly import plotly as py
 from plotly.exceptions import PlotlyError, PlotlyEmptyDataError
 from plotly.files import CONFIG_FILE
 
-# username for tests: 'PlotlyImageTest'
-# api_key for account: '786r5mecv0'
 
+class TestPlot(PlotlyTestCase):
 
-class TestPlot(TestCase):
     def setUp(self):
-        py.sign_in('PlotlyImageTest', '786r5mecv0',
-                   plotly_domain='https://plot.ly')
-        self.simple_figure = {'data': [{'x': [1, 2, 3], 'y': [2, 1, 2]}]}
         super(TestPlot, self).setUp()
+        py.sign_in('PlotlyImageTest', '786r5mecv0')
+        self.simple_figure = {'data': [{'x': [1, 2, 3], 'y': [2, 1, 2]}]}
 
     @attr('slow')
     def test_plot_valid(self):
@@ -50,7 +46,6 @@ def test_plot_valid(self):
         self.assertEqual(saved_fig['data'][0]['y'], fig['data'][0]['y'])
         self.assertEqual(saved_fig['layout']['title'], fig['layout']['title'])
 
-    @raises(PlotlyError)
     def test_plot_invalid(self):
         fig = {
             'data': [
@@ -61,15 +56,18 @@ def test_plot_invalid(self):
                 }
             ]
         }
-        py.plot(fig, auto_open=False, filename='plot_invalid')
+        with self.assertRaises(PlotlyError):
+            py.plot(fig, auto_open=False, filename='plot_invalid')
 
-    @raises(TypeError)
     def test_plot_invalid_args_1(self):
-        py.plot(x=[1, 2, 3], y=[2, 1, 2], auto_open=False, filename='plot_invalid')
+        with self.assertRaises(TypeError):
+            py.plot(x=[1, 2, 3], y=[2, 1, 2], auto_open=False,
+                    filename='plot_invalid')
 
-    @raises(PlotlyError)
     def test_plot_invalid_args_2(self):
-        py.plot([1, 2, 3], [2, 1, 2], auto_open=False, filename='plot_invalid')
+        with self.assertRaises(PlotlyError):
+            py.plot([1, 2, 3], [2, 1, 2], auto_open=False,
+                    filename='plot_invalid')
 
     def test_plot_empty_data(self):
         self.assertRaises(PlotlyEmptyDataError, py.plot, [],
@@ -237,6 +235,12 @@ def setUp(self):
         self.users_current_mock = patcher.start()
         self.addCleanup(patcher.stop)
 
+        # Some tests specifically check how *file-level* plot options alter
+        # plot option logic. In order not to re-write that, we simply clear the
+        # *session* information since it would take precedent. The _session is
+        # set when you `sign_in`.
+        session._session['plot_options'].clear()
+
     def test_default_options(self):
         options = py._plot_option_logic({})
         config_options = tls.get_config_file()