Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit bce3fcf

Browse files
committed
tests
1 parent f5cee59 commit bce3fcf

5 files changed

Lines changed: 15 additions & 17 deletions

File tree

mljar/client/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ def _check_response_status(self, response):
6666
elif response.status_code == 400:
6767
raise BadRequestException(response.content)
6868
elif response.status_code == 500:
69-
raise MljarException('server error: ' +response.content)
69+
raise MljarException('server error: ' +str(response.content))
7070
else:
7171
response.raise_for_status()

mljar/client/project.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from .base import MljarHttpClient
22
from ..model.project import Project
33
from ..exceptions import NotFoundException, CreateProjectException
4+
from ..log import logger
45

56
class ProjectClient(MljarHttpClient):
67
'''
@@ -49,6 +50,7 @@ def delete_project(self, hid):
4950
'''
5051
Deletes project
5152
'''
53+
logger.info('Remove project: %s' % hid)
5254
response = self.request("DELETE", '/'.join([self.url, hid]))
5355
return response.status_code == 204 or response.status_code == 200
5456

tests/dataset_client_test.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ def tearDown(self):
3232

3333

3434
def test_get_datasests(self):
35-
"""
36-
Get empty list of datasets in project.
37-
"""
35+
36+
#Get empty list of datasets in project.
37+
3838
# get datasets
3939
datasets = DatasetClient(self.project.hid).get_datasets()
4040
self.assertEqual(datasets, [])
4141

4242
def test_prepare_data(self):
43-
""" Test _prepare_data method on numpy array data """
43+
#Test _prepare_data method on numpy array data
4444
dc = DatasetClient(self.project.hid)
4545
samples = 100
4646
columns = 10
@@ -56,7 +56,7 @@ def test_prepare_data(self):
5656
self.assertTrue('attribute_10' in data.columns)
5757

5858
def test_get_dataset_for_wrong_hid(self):
59-
""" Get dataset for wrong hid should return None """
59+
#Get dataset for wrong hid should return None
6060
dc = DatasetClient(self.project.hid)
6161
dataset = dc.get_dataset('some-wrong-hid')
6262
self.assertTrue(dataset is None)
@@ -82,7 +82,6 @@ def test_add_dataset_for_training(self):
8282
self.assertTrue('title' in str(my_dataset_2))
8383
self.assertTrue('file' in str(my_dataset_2))
8484

85-
8685
def test_add_dataset_for_prediction(self):
8786
# setup dataset client
8887
dc = DatasetClient(self.project.hid)
@@ -100,7 +99,6 @@ def test_add_dataset_for_prediction(self):
10099
self.assertEqual(my_dataset.hid, my_dataset_2.hid)
101100
self.assertEqual(my_dataset.title, my_dataset_2.title)
102101

103-
104102
def test_add_existing_dataset(self):
105103
# setup dataset client
106104
dc = DatasetClient(self.project.hid)
@@ -119,14 +117,12 @@ def test_add_existing_dataset(self):
119117
datasets = dc.get_datasets()
120118
self.assertEqual(len(datasets), init_datasets_cnt+1)
121119

122-
123120
def test_prepare_data_two_sources(self):
124121
dc = DatasetClient(self.project.hid)
125122
data_1, data_hash_1 = dc._prepare_data(self.X, self.y)
126123
data_2, data_hash_2 = dc._prepare_data(self.X, None)
127124
self.assertNotEqual(data_hash_1, data_hash_2)
128125

129-
130126
def test_prepare_data_two_sources_numpy(self):
131127
dc = DatasetClient(self.project.hid)
132128
data_1, data_hash_1 = dc._prepare_data(np.array(self.X), np.array(self.y))

tests/experiment_client_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ def setUp(self):
4040

4141
def tearDown(self):
4242
# wait before clean, to have time to initialize models
43-
#time.sleep(60)
43+
time.sleep(60)
4444
# clean
45-
#self.project_client.delete_project(self.project.hid)
46-
pass
45+
self.project_client.delete_project(self.project.hid)
46+
4747

4848
'''
4949
def test_create_with_kfold_cv(self):

tests/project_based_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def clean_projects():
1818
project_client = ProjectClient()
1919
projects = project_client.get_projects()
2020
for proj in projects:
21-
if proj.title.startswith('Test'):
21+
if proj.title.startswith('Test') and proj.title.endswith(get_postfix()):
2222
project_client.delete_project(proj.hid)
2323

2424
@classmethod
2525
def setUpClass(cls):
2626
ProjectBasedTest.clean_projects()
2727

28-
#@classmethod
29-
#def tearDownClass(cls):
30-
# ProjectBasedTest.clean_projects()
28+
@classmethod
29+
def tearDownClass(cls):
30+
ProjectBasedTest.clean_projects()

0 commit comments

Comments
 (0)