folder tests; test for plotly exception

Author: chriddyp

plotly/tests/test_core/test_file/test_file.py

@@ -14,7 +14,7 @@
 
 import plotly.plotly as py
 import plotly.tools as tls
-
+from plotly.exceptions import PlotlyRequestError
 
 def _random_filename():
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
@@ -29,20 +29,22 @@ def init():
 
 def test_create_folder():
     init()
-    py.file_ops.mkdir(_random_filename())
+    py.file_ops.mkdirs(_random_filename())
 
 
 def test_create_nested_folders():
     init()
     first_folder = _random_filename()
-    second_folder = '{}/{}'.format(first_folder, _random_filename())
-    py.file_ops.mkdir(first_folder)
-    py.file_ops.mkdir(second_folder)
+    nested_folder = '{}/{}'.format(first_folder, _random_filename())
+    py.file_ops.mkdirs(nested_folder)
 
 
-@raises(requests.exceptions.HTTPError) # TODO: 409, not just any 4xx
 def test_duplicate_folders():
     init()
     first_folder = _random_filename()
-    py.file_ops.mkdir(first_folder)
-    py.file_ops.mkdir(first_folder)
+    py.file_ops.mkdirs(first_folder)
+    try:
+        py.file_ops.mkdirs(first_folder)
+    except PlotlyRequestError as e:
+        if e.status_code != 409:
+            raise e

plotly/tests/test_core/test_grid/test_grid.py

@@ -10,32 +10,64 @@
 
 import random
 import string
-import requests
+from nose.plugins.attrib import attr
 
 from plotly.graph_objs import Scatter
 import plotly.plotly as py
 import plotly.tools as tls
 from plotly.grid_objs import Column, Grid
-from plotly.exceptions import InputError
-from nose.plugins.attrib import attr
+from plotly.exceptions import InputError, PlotlyRequestError
 
-def upload_and_return_grid():
-    tls.set_config_file('https://local.plot.ly')
-    py.sign_in('GridTest', 'fp4rldzhv0')
 
+def _random_filename():
+    random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
+    unique_filename = 'Valid Grid '+''.join(random_chars)
+    return unique_filename
+
+
+def _get_grid():
     c1 = Column('first column', [1, 2, 3, 4])
     c2 = Column('second column', ['a', 'b', 'c', 'd'])
     g = Grid([c1, c2])
+    return g
+
+
+def _init():
+    tls.set_config_file('https://local.plot.ly')
+    py.sign_in('GridTest', 'fp4rldzhv0')
+
+
+def upload_and_return_grid():
+    _init()
+    g = _get_grid()
+    unique_filename = _random_filename()
 
-    random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
-    unique_filename = 'Valid Grid '+''.join(random_chars)
     py.grid_ops.upload(g, unique_filename, auto_open=False)
     return g
 
+
 ## Nominal usage
 def test_grid_upload():
     upload_and_return_grid()
 
+
+def test_grid_upload_in_new_folder():
+    _init()
+    g = _get_grid()
+    path = 'new folder: {}/grid in folder {}'.format(_random_filename(), _random_filename())
+    py.grid_ops.upload(g, path, auto_open=False)
+
+
+def test_grid_upload_in_existing_folder():
+    _init()
+    g = _get_grid()
+    folder = _random_filename()
+    filename = _random_filename()
+    py.file_ops.mkdirs(folder)
+    path = 'existing folder: {}/grid in folder {}'.format(folder, filename)
+    py.grid_ops.upload(g, path, auto_open=False)
+
+
 def test_column_append():
     g = upload_and_return_grid()
     new_col = Column('new col', [1, 5, 3])
@@ -104,15 +136,15 @@ def test_scatter_from_non_uploaded_grid():
     Scatter(xsrc=g[0], ysrc=g[1])
 
 
-@raises(requests.exceptions.HTTPError)
+@raises(PlotlyRequestError)
 def test_column_append_of_non_uploaded_grid():
     c1 = Column('first column', [1, 2, 3, 4])
     c2 = Column('second column', ['a', 'b', 'c', 'd'])
     g = Grid([c1])
     py.grid_ops.append_columns([c2], grid=g)
 
 
-@raises(requests.exceptions.HTTPError)
+@raises(PlotlyRequestError)
 def test_row_append_of_non_uploaded_grid():
     c1 = Column('first column', [1, 2, 3, 4])
     rows = [[1], [2]]
@@ -136,13 +168,27 @@ def test_duplicate_columns():
     Grid([c1, c2])
 
 
+# Test delete
+def test_delete_grid():
+    _init()
+    g = _get_grid()
+    fn = _random_filename()
+    py.grid_ops.upload(g, fn, auto_open=False)
+    py.grid_ops.delete(g)
+    py.grid_ops.upload(g, fn, auto_open=False)
+
+
 ## Plotly failures
-@raises(requests.exceptions.HTTPError)
 def test_duplicate_filenames():
     c1 = Column('first column', [1, 2, 3, 4])
     g = Grid([c1])
 
     random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]
     unique_filename = 'Valid Grid '+''.join(random_chars)
     py.grid_ops.upload(g, unique_filename, auto_open=False)
-    py.grid_ops.upload(g, unique_filename, auto_open=False)
+    try:
+        py.grid_ops.upload(g, unique_filename, auto_open=False)
+    except PlotlyRequestError as e:
+        if e.status_code != 409:
+            raise e
+

plotly/tests/test_core/test_meta/test_meta.py

@@ -15,7 +15,8 @@
 import plotly.plotly as py
 import plotly.tools as tls
 from plotly.grid_objs import Column, Grid
-from nose.plugins.attrib import attr
+from plotly.exceptions import PlotlyRequestError
+
 
 def init():
     tls.set_config_file('https://local.plot.ly')
@@ -57,7 +58,7 @@ def test_upload_meta_with_grid():
         auto_open=False)
 
 
-@raises(requests.exceptions.HTTPError)
+@raises(PlotlyRequestError)
 def test_metadata_to_nonexistent_grid():
     init()