all test_core tests passing (sans streaming tests)

plotly · jonmmease · May 7, 2018 · Apr 23, 2018 · Apr 23, 2018 · Apr 23, 2018
commit c2821a6b354a67dd005fcb89252391f2ebb762ed
diff --git a/plotly/tests/test_core/test_figure_messages/test_add_traces.py b/plotly/tests/test_core/test_figure_messages/test_add_traces.py
@@ -1,11 +1,14 @@
+import sys
 from unittest import TestCase
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock
 
+
 class TestAddTracesMessage(TestCase):
     def setUp(self):
         # Construct initial scatter object

diff --git a/plotly/tests/test_core/test_figure_messages/test_batch_animate.py b/plotly/tests/test_core/test_figure_messages/test_batch_animate.py
@@ -1,4 +1,6 @@
+import sys
 from unittest import TestCase
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:

diff --git a/plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py b/plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py
@@ -1,7 +1,9 @@
+import sys
 from unittest import TestCase
-import plotly.graph_objs as go
 from nose.tools import raises
 
+import plotly.graph_objs as go
+
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:

diff --git a/plotly/tests/test_core/test_figure_messages/test_on_change.py b/plotly/tests/test_core/test_figure_messages/test_on_change.py
@@ -1,7 +1,9 @@
+import sys
 from unittest import TestCase
-import plotly.graph_objs as go
 from nose.tools import raises
 
+import plotly.graph_objs as go
+
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:
     from unittest.mock import MagicMock
 else:

diff --git a/plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py b/plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py
@@ -1,5 +1,6 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
+
 import plotly.graph_objs as go
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:

diff --git a/plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py b/plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py
@@ -1,5 +1,5 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
 
 import plotly.graph_objs as go
 

diff --git a/plotly/tests/test_core/test_figure_messages/test_plotly_update.py b/plotly/tests/test_core/test_figure_messages/test_plotly_update.py
@@ -1,5 +1,5 @@
+import sys
 from unittest import TestCase
-from nose.tools import raises
 
 import plotly.graph_objs as go
 from plotly.basedatatypes import Undefined

diff --git a/plotly/tests/test_core/test_graph_objs/test_update.py b/plotly/tests/test_core/test_graph_objs/test_update.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from unittest import skip
 
-from plotly.graph_objs import Data, Figure, Layout, Line, Scatter, XAxis
+from plotly.graph_objs import Data, Figure, Layout, Line, Scatter, scatter, XAxis
 from plotly.tests.utils import strip_dict_params
 
 
@@ -58,12 +58,3 @@ def test_update_list_make_copies_false():
     update = dict(x=[2, 3, 4], y=[1, 2, 3], line=Line())
     data.update(update, make_copies=False)
     assert data[0]['line'] is data[1]['line']
-
-
-def test_update_list_make_copies_true():
-    trace1 = Scatter(x=[1, 2, 3], y=[2, 1, 2])
-    trace2 = Scatter(x=[1, 2, 3], y=[3, 2, 1])
-    data = Data([trace1, trace2])
-    update = dict(x=[2, 3, 4], y=[1, 2, 3], line=Line())
-    data.update(update, make_copies=True)
-    assert data[0]['line'] is not data[1]['line']
diff --git a/plotly/tests/test_core/test_grid/test_grid.py b/plotly/tests/test_core/test_grid/test_grid.py
@@ -93,7 +93,7 @@ def test_row_append(self):
     @attr('slow')
     def test_plot_from_grid(self):
         g = self.upload_and_return_grid()
-        url = py.plot([Scatter(xsrc=g[0], ysrc=g[1])],
+        url = py.plot([Scatter(xsrc=g[0].id, ysrc=g[1].id)],
                       auto_open=False, filename='plot from grid')
         return url, g
 
@@ -103,8 +103,8 @@ def test_get_figure_from_references(self):
         fig = py.get_figure(url)
         data = fig['data']
         trace = data[0]
-        assert(g[0].data == trace['x'])
-        assert(g[1].data == trace['y'])
+        assert(tuple(g[0].data) == tuple(trace['x']))
+        assert(tuple(g[1].data) == tuple(trace['y']))
 
     def test_grid_id_args(self):
         self.assertEqual(parse_grid_id_args(self._grid, None),

diff --git a/plotly/tests/test_core/test_offline/test_offline.py b/plotly/tests/test_core/test_offline/test_offline.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import
 
 import os
+import re
 from unittest import TestCase
 
 from requests.compat import json as _json
@@ -45,8 +46,8 @@ def _read_html(self, file_url):
             return f.read()
 
     def test_default_plot_generates_expected_html(self):
-        data_json = _json.dumps(fig['data'],
-                                cls=plotly.utils.PlotlyJSONEncoder)
+        # add uid to data_json for regex search
+        data_json = '\[\{"x": \[1, 2, 3\], "y": \[10, 20, 30\], "type": "scatter", "uid": .+\}\]'
         layout_json = _json.dumps(
             fig['layout'],
             cls=plotly.utils.PlotlyJSONEncoder)
@@ -56,7 +57,7 @@ def test_default_plot_generates_expected_html(self):
         # I don't really want to test the entire script output, so
         # instead just make sure a few of the parts are in here?
         self.assertIn('Plotly.newPlot', html)  # plot command is in there
-        self.assertIn(data_json, html)         # data is in there
+        self.assertTrue(re.search(data_json, html))  # data is in there
         self.assertIn(layout_json, html)       # so is layout
         self.assertIn(PLOTLYJS, html)          # and the source code
         # and it's an <html> doc

diff --git a/plotly/tests/test_core/test_plotly/test_plot.py b/plotly/tests/test_core/test_plotly/test_plot.py
@@ -9,6 +9,7 @@
 
 import requests
 import six
+import sys
 from requests.compat import json as _json
 
 from nose.plugins.attrib import attr
@@ -20,7 +21,6 @@
 from plotly.exceptions import PlotlyError, PlotlyEmptyDataError
 from plotly.files import CONFIG_FILE
 
-import sys
 
 # import from mock
 if sys.version_info.major == 3 and sys.version_info.minor >= 3:

diff --git a/plotly/tests/test_core/test_tools/test_make_subplots.py b/plotly/tests/test_core/test_tools/test_make_subplots.py
@@ -3,7 +3,7 @@
 from unittest import TestCase
 
 from plotly.graph_objs import (Annotation, Annotations, Data, Figure, Font,
-                               Layout, Scene, XAxis, YAxis)
+                               Layout, layout, Scene, XAxis, YAxis)
 import plotly.tools as tls
 
 
@@ -144,19 +144,19 @@ def test_two_row_bottom_left(self):
         expected = Figure(
             data=Data(),
             layout=Layout(
-                xaxis1=XAxis(
+                xaxis1=layout.XAxis(
                     domain=[0.0, 1.0],
                     anchor='y'
                 ),
-                xaxis2=XAxis(
+                xaxis2=layout.XAxis(
                     domain=[0.0, 1.0],
                     anchor='y2'
                 ),
-                yaxis1=YAxis(
-                    domain=[0.575, 1.0],
+                yaxis1=layout.YAxis(
+                    domain=[0.0, 0.425],
                     anchor='x'
                 ),
-                yaxis2=YAxis(
+                yaxis2=layout.YAxis(
                     domain=[0.575, 1.0],
                     anchor='x2'
                 ),