Rename test data to uniform filename format
diff --git a/tests/data/duplicate_authorize_security_group_egress.json b/tests/data/invalid_authorize_security_group_egress_duplicate.json
similarity index 100%
rename from tests/data/duplicate_authorize_security_group_egress.json
rename to tests/data/invalid_authorize_security_group_egress_duplicate.json
diff --git a/tests/data/duplicate_authorize_security_group_ingress.json b/tests/data/invalid_authorize_security_group_ingress_duplicate.json
similarity index 100%
rename from tests/data/duplicate_authorize_security_group_ingress.json
rename to tests/data/invalid_authorize_security_group_ingress_duplicate.json
diff --git a/tests/data/duplicate_create_keypair.json b/tests/data/invalid_create_keypair_duplicate.json
similarity index 100%
rename from tests/data/duplicate_create_keypair.json
rename to tests/data/invalid_create_keypair_duplicate.json
diff --git a/tests/data/duplicate_create_security_group.json b/tests/data/invalid_create_security_group_duplicate.json
similarity index 100%
rename from tests/data/duplicate_create_security_group.json
rename to tests/data/invalid_create_security_group_duplicate.json
diff --git a/tests/data/invalid_create_tag.json b/tests/data/invalid_create_tag_invalid_id.json
similarity index 100%
rename from tests/data/invalid_create_tag.json
rename to tests/data/invalid_create_tag_invalid_id.json
diff --git a/tests/data/create_volume_invalid_snapshot_response.json b/tests/data/invalid_create_volume_invalid_snapshot_response.json
similarity index 100%
rename from tests/data/create_volume_invalid_snapshot_response.json
rename to tests/data/invalid_create_volume_invalid_snapshot_response.json
diff --git a/tests/data/create_vpc_invalid_cidr.json b/tests/data/invalid_create_vpc_invalid_cidr.json
similarity index 100%
rename from tests/data/create_vpc_invalid_cidr.json
rename to tests/data/invalid_create_vpc_invalid_cidr.json
diff --git a/tests/data/invalid_delete_tag.json b/tests/data/invalid_delete_tag_invalid_tag_id.json
similarity index 100%
rename from tests/data/invalid_delete_tag.json
rename to tests/data/invalid_delete_tag_invalid_tag_id.json
diff --git a/tests/data/invalid_volume_id.json b/tests/data/invalid_delete_volume_invalid_volume_id.json
similarity index 100%
rename from tests/data/invalid_volume_id.json
rename to tests/data/invalid_delete_volume_invalid_volume_id.json
diff --git a/tests/data/invalid_image_id.json b/tests/data/invalid_describe_image_invalid_image_id.json
similarity index 100%
rename from tests/data/invalid_image_id.json
rename to tests/data/invalid_describe_image_invalid_image_id.json
diff --git a/tests/data/invalid_instance_id.json b/tests/data/invalid_describe_volume_invalid_instance_id.json
similarity index 100%
rename from tests/data/invalid_instance_id.json
rename to tests/data/invalid_describe_volume_invalid_instance_id.json
diff --git a/tests/data/duplicate_import_keypair.json b/tests/data/invalid_import_keypair_duplicate.json
similarity index 100%
rename from tests/data/duplicate_import_keypair.json
rename to tests/data/invalid_import_keypair_duplicate.json
diff --git a/tests/data/authorize_security_group_egress.json b/tests/data/valid_authorize_security_group_egress.json
similarity index 100%
rename from tests/data/authorize_security_group_egress.json
rename to tests/data/valid_authorize_security_group_egress.json
diff --git a/tests/data/authorize_security_group_ingress.json b/tests/data/valid_authorize_security_group_ingress.json
similarity index 100%
rename from tests/data/authorize_security_group_ingress.json
rename to tests/data/valid_authorize_security_group_ingress.json
diff --git a/tests/data/create_tag.json b/tests/data/valid_create_tag.json
similarity index 100%
rename from tests/data/create_tag.json
rename to tests/data/valid_create_tag.json
diff --git a/tests/data/create_volume_response.json b/tests/data/valid_create_volume_response.json
similarity index 100%
rename from tests/data/create_volume_response.json
rename to tests/data/valid_create_volume_response.json
diff --git a/tests/data/delete_keypair.json b/tests/data/valid_delete_keypair.json
similarity index 100%
rename from tests/data/delete_keypair.json
rename to tests/data/valid_delete_keypair.json
diff --git a/tests/data/delete_tag.json b/tests/data/valid_delete_tag.json
similarity index 100%
rename from tests/data/delete_tag.json
rename to tests/data/valid_delete_tag.json
diff --git a/tests/data/delete_volume_response.json b/tests/data/valid_delete_volume_response.json
similarity index 100%
rename from tests/data/delete_volume_response.json
rename to tests/data/valid_delete_volume_response.json
diff --git a/tests/data/list_tags.json b/tests/data/valid_describe_tags.json
similarity index 100%
rename from tests/data/list_tags.json
rename to tests/data/valid_describe_tags.json
diff --git a/tests/disk_offering_tests.py b/tests/disk_offering_tests.py
index c091229..fcdaca2 100644
--- a/tests/disk_offering_tests.py
+++ b/tests/disk_offering_tests.py
@@ -20,7 +20,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_volume_response.json'
+ 'tests/data/valid_create_volume_response.json'
)
get.return_value.status_code = 200
diff --git a/tests/keypair_tests.py b/tests/keypair_tests.py
index 9017a65..2e6732a 100644
--- a/tests/keypair_tests.py
+++ b/tests/keypair_tests.py
@@ -40,7 +40,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/duplicate_create_keypair.json'
+ 'tests/data/invalid_create_keypair_duplicate.json'
)
get.return_value.status_code = 431
@@ -61,7 +61,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/delete_keypair.json'
+ 'tests/data/valid_delete_keypair.json'
)
get.return_value.status_code = 200
@@ -119,7 +119,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/duplicate_import_keypair.json'
+ 'tests/data/invalid_import_keypair_duplicate.json'
)
get.return_value.status_code = 431
diff --git a/tests/security_group_tests.py b/tests/security_group_tests.py
index f276907..57c07b1 100644
--- a/tests/security_group_tests.py
+++ b/tests/security_group_tests.py
@@ -23,7 +23,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/authorize_security_group_ingress.json'
+ 'tests/data/valid_authorize_security_group_ingress.json'
)
get.return_value.status_code = 200
@@ -47,7 +47,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/authorize_security_group_ingress.json'
+ 'tests/data/valid_authorize_security_group_ingress.json'
)
get.return_value.status_code = 200
@@ -72,7 +72,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/authorize_security_group_egress.json'
+ 'tests/data/valid_authorize_security_group_egress.json'
)
get.return_value.status_code = 200
@@ -96,7 +96,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/authorize_security_group_egress.json'
+ 'tests/data/valid_authorize_security_group_egress.json'
)
get.return_value.status_code = 200
@@ -121,7 +121,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/duplicate_authorize_security_group_egress.json'
+ 'tests/data/invalid_authorize_security_group_egress_duplicate.json'
)
get.return_value.status_code = 200
@@ -216,7 +216,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/duplicate_create_security_group.json'
+ 'tests/data/invalid_create_security_group_duplicate.json'
)
get.return_value.status_code = 431
diff --git a/tests/tags_tests.py b/tests/tags_tests.py
index 10f4fad..6dc1958 100644
--- a/tests/tags_tests.py
+++ b/tests/tags_tests.py
@@ -23,7 +23,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_tag.json'
+ 'tests/data/valid_create_tag.json'
)
get.return_value.status_code = 200
@@ -48,7 +48,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_tag.json'
+ 'tests/data/valid_create_tag.json'
)
get.return_value.status_code = 200
@@ -73,7 +73,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/invalid_create_tag.json'
+ 'tests/data/invalid_create_tag_invalid_id.json'
)
get.return_value.status_code = 200
@@ -97,7 +97,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/delete_tag.json'
+ 'tests/data/valid_delete_tag.json'
)
get.return_value.status_code = 200
@@ -121,7 +121,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/delete_tag.json'
+ 'tests/data/valid_delete_tag.json'
)
get.return_value.status_code = 200
@@ -145,7 +145,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/invalid_delete_tag.json'
+ 'tests/data/invalid_delete_tag_invalid_tag_id.json'
)
get.return_value.status_code = 200
@@ -155,8 +155,6 @@
data=data
)
- print response.data
-
self.assert_bad_request(response)
assert 'The specified ID for the resource you are trying to tag is not valid.' in response.data
@@ -168,7 +166,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/delete_keypair.json'
+ 'tests/data/valid_delete_keypair.json'
)
get.return_value.status_code = 200
@@ -188,7 +186,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/list_tags.json'
+ 'tests/data/valid_describe_tags.json'
)
get.return_value.status_code = 200
diff --git a/tests/volume_tests.py b/tests/volume_tests.py
index e787095..6e6c5c3 100644
--- a/tests/volume_tests.py
+++ b/tests/volume_tests.py
@@ -112,7 +112,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_volume_response.json'
+ 'tests/data/valid_create_volume_response.json'
)
get.return_value.status_code = 200
@@ -152,7 +152,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_volume_response.json'
+ 'tests/data/valid_create_volume_response.json'
)
get.return_value.status_code = 200
@@ -183,7 +183,7 @@
get_request = mock.Mock()
get_request.return_value.text = read_file(
- 'tests/data/create_volume_invalid_snapshot_response.json'
+ 'tests/data/invalid_create_volume_invalid_snapshot_response.json'
)
get_request.return_value.status_code = 431
@@ -257,7 +257,7 @@
get_request = mock.Mock()
get_request.return_value.text = read_file(
- 'tests/data/delete_volume_response.json'
+ 'tests/data/valid_delete_volume_response.json'
)
get_request.return_value.status_code = 200
@@ -278,7 +278,7 @@
get_request = mock.Mock()
get_request.return_value.text = read_file(
- 'tests/data/invalid_volume_id.json'
+ 'tests/data/invalid_delete_volume_invalid_volume_id.json'
)
get_request.return_value.status_code = 200
diff --git a/tests/vpc_tests.py b/tests/vpc_tests.py
index 5ed3a26..da05c58 100644
--- a/tests/vpc_tests.py
+++ b/tests/vpc_tests.py
@@ -55,7 +55,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_vpc_invalid_cidr.json'
+ 'tests/data/invalid_create_vpc_invalid_cidr.json'
)
get.return_value.status_code = 200
@@ -109,7 +109,7 @@
'/',
data=data
)
- print response.data
+
self.assert_ok(response)
assert 'DescribeVpcsResponse' in response.data
assert 'examplevpc' in response.data
diff --git a/tests/zones_tests.py b/tests/zones_tests.py
index 7b5f5bd..5f0d9e5 100644
--- a/tests/zones_tests.py
+++ b/tests/zones_tests.py
@@ -104,7 +104,7 @@
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/create_volume_response.json'
+ 'tests/data/valid_create_volume_response.json'
)
get.return_value.status_code = 200
