Skip to content

Commit

Permalink
Improve tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@gerardparis
gerardparis committed Oct 24, 2016
1 parent 2e4d5e0 commit 8de5618
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 9 deletions.
3 changes: 3 additions & 0 deletions api/filters/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def test_list_storlet_ok(self, mock_is_valid_request):
self.assertNotEqual(response.content, "[]")
storlets = json.loads(response.content)
self.assertEqual(storlets[0]['main'], "com.example.FakeMain")
self.assertEqual(storlets[0]['id'], "1")

def test_delete_storlet_ok(self, mock_is_valid_request):
"""
Expand Down Expand Up @@ -249,6 +250,7 @@ def test_filter_deploy_to_project_ok(self, mock_put_object, mock_is_valid_reques
request.META['HTTP_X_AUTH_TOKEN'] = 'fake_token'
response = filter_deploy(request, "1", "0123456789abcdef")
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.content, '1')
mock_put_object.assert_called_with(settings.SWIFT_URL + settings.SWIFT_API_VERSION + "/AUTH_0123456789abcdef",
'fake_token', "storlet", "test-1.0.jar", mock.ANY, mock.ANY, mock.ANY,
mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY)
Expand All @@ -275,6 +277,7 @@ def test_filter_deploy_to_project_and_container_ok(self, mock_put_object, mock_i
request.META['HTTP_X_AUTH_TOKEN'] = 'fake_token'
response = filter_deploy(request, "1", "0123456789abcdef", "container1")
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.content, '1')
mock_put_object.assert_called_with(settings.SWIFT_URL + settings.SWIFT_API_VERSION + "/AUTH_0123456789abcdef",
'fake_token', "storlet", "test-1.0.jar", mock.ANY, mock.ANY, mock.ANY,
mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY)
Expand Down
40 changes: 31 additions & 9 deletions api/registry/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ def test_registry_dynamic_policy_create_spawn_id_ok(self, mock_create_local_host
# response = policy_list(request)
# self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)


#
# Metric tests
#
Expand Down Expand Up @@ -486,13 +485,13 @@ def test_get_storage_node_ok(self, mock_is_valid_request):
self.assertEqual(response.status_code, status.HTTP_200_OK)
metric_data = json.loads(response.content)
self.assertEqual(metric_data['name'], 'storagenode1')
self.assertEqual(metric_data['location'], 'location1')
self.assertEqual(metric_data['type'], 'type1')
self.assertEqual(metric_data['location'], 'r1z1-192.168.1.5:6000/sdb1')
self.assertEqual(metric_data['type'], 'hdd')

def test_update_storage_node_ok(self, mock_is_valid_request):
mock_is_valid_request.return_value = 'fake_token'
snode_id = 1
data = {'name': 'storagenode1updated', 'location': 'location1updated', 'type': 'type1updated'}
data = {'name': 'storagenode1updated', 'location': 'r1z1-192.168.1.6:6000/sdb1', 'type': 'hddupdated'}
request = self.factory.put('/registry/snode/' + str(snode_id), data, format='json')
response = storage_node_detail(request, str(snode_id))
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
Expand All @@ -503,8 +502,8 @@ def test_update_storage_node_ok(self, mock_is_valid_request):
self.assertEqual(response.status_code, status.HTTP_200_OK)
metric_data = json.loads(response.content)
self.assertEqual(metric_data['name'], 'storagenode1updated')
self.assertEqual(metric_data['location'], 'location1updated')
self.assertEqual(metric_data['type'], 'type1updated')
self.assertEqual(metric_data['location'], 'r1z1-192.168.1.6:6000/sdb1')
self.assertEqual(metric_data['type'], 'hddupdated')

def test_delete_storage_node_ok(self, mock_is_valid_request):
mock_is_valid_request.return_value = 'fake_token'
Expand Down Expand Up @@ -1083,6 +1082,27 @@ def test_registry_static_policy_detail_ok(self, mock_get_project_list, mock_is_v
json_data = json.loads(response.content)
self.assertEqual(json_data["target_name"], 'tenantA')

@mock.patch('registry.views.get_project_list')
def test_registry_static_policy_update(self, mock_get_project_list, mock_is_valid_request):
mock_is_valid_request.return_value = 'fake_token'
mock_get_project_list.return_value = {'0123456789abcdef': 'tenantA', '2': 'tenantB'}

# Create an instance of a PUT request.
data = {"execution_server": "object", "execution_server_reverse": "object"}
request = self.factory.put('/registry/static_policy/0123456789abcdef:1', data, format='json')
request.META['HTTP_X_AUTH_TOKEN'] = 'fake_token'
response = static_policy_detail(request, '0123456789abcdef:1')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)

# Create an instance of a GET request.
request = self.factory.get('/registry/static_policy/0123456789abcdef:1')
request.META['HTTP_X_AUTH_TOKEN'] = 'fake_token'
response = static_policy_detail(request, '0123456789abcdef:1')
self.assertEqual(response.status_code, status.HTTP_200_OK)
json_data = json.loads(response.content)
self.assertEqual(json_data["execution_server"], 'object')
self.assertEqual(json_data["execution_server_reverse"], 'object')

@mock.patch('registry.views.get_project_list')
def test_registry_static_policy_detail_delete(self, mock_get_project_list, mock_is_valid_request):
mock_is_valid_request.return_value = 'fake_token'
Expand Down Expand Up @@ -1174,8 +1194,10 @@ def create_object_type_docs(self, mock_is_valid_request):
self.assertEqual(response.status_code, status.HTTP_201_CREATED)

def setup_dsl_parser_data(self):
self.r.hmset('dsl_filter:compression', {'identifier': '1', 'valid_parameters': '{"cparam1": "integer", "cparam2": "integer", "cparam3": "integer"}'})
self.r.hmset('dsl_filter:encryption', {'identifier': '2', 'valid_parameters': '{"eparam1": "integer", "eparam2": "bool", "eparam3": "string"}'})
self.r.hmset('dsl_filter:compression', {'identifier': '1', 'valid_parameters': '{"cparam1": "integer", "cparam2": "integer", "cparam3": "integer"}',
'activation_url': 'http://10.30.1.6:9000/filters'})
self.r.hmset('dsl_filter:encryption', {'identifier': '2', 'valid_parameters': '{"eparam1": "integer", "eparam2": "bool", "eparam3": "string"}',
'activation_url': 'http://10.30.1.6:9000/filters'})
self.r.hmset('metric:metric1', {'network_location': '?', 'type': 'integer'})
self.r.hmset('metric:metric2', {'network_location': '?', 'type': 'integer'})
self.r.rpush('G:1', '1234567890abcdef')
Expand All @@ -1202,7 +1224,7 @@ def create_nodes(self):

def create_storage_nodes(self):
self.r.incr("storage_nodes:id") # setting autoincrement to 1
self.r.hmset('SN:1', {'name': 'storagenode1', 'location': 'location1', 'type': 'type1'})
self.r.hmset('SN:1', {'name': 'storagenode1', 'location': 'r1z1-192.168.1.5:6000/sdb1', 'type': 'hdd'})

def create_metric_modules(self):
self.r.incr("workload_metrics:id") # setting autoincrement to 1
Expand Down

0 comments on commit 8de5618

Please sign in to comment.