| 
5 | 5 | A module intended for use with Nose.  | 
6 | 6 | 
  | 
7 | 7 | """  | 
8 |  | - | 
9 |  | -from nose.tools import raises  | 
10 |  | -from nose import with_setup  | 
11 |  | - | 
12 | 8 | import random  | 
13 | 9 | import string  | 
14 |  | -import requests  | 
 | 10 | +from unittest import TestCase  | 
15 | 11 | 
 
  | 
16 | 12 | import plotly.plotly as py  | 
17 |  | -import plotly.tools as tls  | 
18 | 13 | from plotly.exceptions import PlotlyRequestError  | 
19 | 14 | 
 
  | 
20 | 15 | 
 
  | 
21 |  | -def _random_filename():  | 
22 |  | -    random_chars = [random.choice(string.ascii_uppercase) for _ in range(5)]  | 
23 |  | -    unique_filename = 'Valid Folder'+''.join(random_chars)  | 
24 |  | -    return unique_filename  | 
25 |  | - | 
26 |  | - | 
27 |  | -def init():  | 
28 |  | -    py.sign_in('PythonTest', '9v9f20pext')  | 
29 |  | - | 
 | 16 | +class FolderAPITestCase(TestCase):  | 
30 | 17 | 
 
  | 
31 |  | -@with_setup(init)  | 
32 |  | -def test_create_folder():  | 
33 |  | -    py.file_ops.mkdirs(_random_filename())  | 
 | 18 | +    def setUp(self):  | 
 | 19 | +        py.sign_in('PythonTest', '9v9f20pext')  | 
34 | 20 | 
 
  | 
 | 21 | +    def _random_filename(self):  | 
 | 22 | +        random_chars = [random.choice(string.ascii_uppercase)  | 
 | 23 | +                        for _ in range(5)]  | 
 | 24 | +        unique_filename = 'Valid Folder'+''.join(random_chars)  | 
 | 25 | +        return unique_filename  | 
35 | 26 | 
 
  | 
36 |  | -@with_setup(init)  | 
37 |  | -def test_create_nested_folders():  | 
38 |  | -    first_folder = _random_filename()  | 
39 |  | -    nested_folder = '{0}/{1}'.format(first_folder, _random_filename())  | 
40 |  | -    py.file_ops.mkdirs(nested_folder)  | 
 | 27 | +    def test_create_folder(self):  | 
 | 28 | +        try:  | 
 | 29 | +            py.file_ops.mkdirs(self._random_filename())  | 
 | 30 | +        except PlotlyRequestError as e:  | 
 | 31 | +            self.fail('Expected this *not* to fail! Status: {}'  | 
 | 32 | +                      .format(e.status_code))  | 
41 | 33 | 
 
  | 
 | 34 | +    def test_create_nested_folders(self):  | 
 | 35 | +        first_folder = self._random_filename()  | 
 | 36 | +        nested_folder = '{0}/{1}'.format(first_folder, self._random_filename())  | 
 | 37 | +        try:  | 
 | 38 | +            py.file_ops.mkdirs(nested_folder)  | 
 | 39 | +        except PlotlyRequestError as e:  | 
 | 40 | +            self.fail('Expected this *not* to fail! Status: {}'  | 
 | 41 | +                      .format(e.status_code))  | 
42 | 42 | 
 
  | 
43 |  | -@with_setup(init)  | 
44 |  | -def test_duplicate_folders():  | 
45 |  | -    first_folder = _random_filename()  | 
46 |  | -    py.file_ops.mkdirs(first_folder)  | 
47 |  | -    try:  | 
 | 43 | +    def test_duplicate_folders(self):  | 
 | 44 | +        first_folder = self._random_filename()  | 
48 | 45 |         py.file_ops.mkdirs(first_folder)  | 
49 |  | -    except PlotlyRequestError as e:  | 
50 |  | -        if e.status_code != 409:  | 
51 |  | -            raise e  | 
 | 46 | +        try:  | 
 | 47 | +            py.file_ops.mkdirs(first_folder)  | 
 | 48 | +        except PlotlyRequestError as e:  | 
 | 49 | +            self.assertTrue(400 <= e.status_code < 500)  | 
 | 50 | +        else:  | 
 | 51 | +            self.fail('Expected this to fail!')  | 
0 commit comments