merge

tests/test_iam/test_iam_account_aliases.py

@@ -1,20 +1,20 @@
-import boto3
-import sure  # noqa
-from moto import mock_iam
-
-
-@mock_iam()
-def test_account_aliases():
-    client = boto3.client('iam', region_name='us-east-1')
-
-    alias = 'my-account-name'
-    aliases = client.list_account_aliases()
-    aliases.should.have.key('AccountAliases').which.should.equal([])
-
-    client.create_account_alias(AccountAlias=alias)
-    aliases = client.list_account_aliases()
-    aliases.should.have.key('AccountAliases').which.should.equal([alias])
-
-    client.delete_account_alias(AccountAlias=alias)
-    aliases = client.list_account_aliases()
-    aliases.should.have.key('AccountAliases').which.should.equal([])
+import boto3
+import sure  # noqa
+from moto import mock_iam
+
+
+@mock_iam()
+def test_account_aliases():
+    client = boto3.client('iam', region_name='us-east-1')
+
+    alias = 'my-account-name'
+    aliases = client.list_account_aliases()
+    aliases.should.have.key('AccountAliases').which.should.equal([])
+
+    client.create_account_alias(AccountAlias=alias)
+    aliases = client.list_account_aliases()
+    aliases.should.have.key('AccountAliases').which.should.equal([alias])
+
+    client.delete_account_alias(AccountAlias=alias)
+    aliases = client.list_account_aliases()
+    aliases.should.have.key('AccountAliases').which.should.equal([])

tests/test_iam/test_iam_groups.py

@@ -1,155 +1,155 @@
-from __future__ import unicode_literals
-
-from datetime import datetime
-
-import boto
-import boto3
-import sure  # noqa
-
-from nose.tools import assert_raises
-from boto.exception import BotoServerError
-from moto import mock_iam, mock_iam_deprecated
-
-
-@mock_iam_deprecated()
-def test_create_group():
-    conn = boto.connect_iam()
-    conn.create_group('my-group')
-    with assert_raises(BotoServerError):
-        conn.create_group('my-group')
-
-
-@mock_iam_deprecated()
-def test_get_group():
-    conn = boto.connect_iam()
-    conn.create_group('my-group')
-    conn.get_group('my-group')
-    with assert_raises(BotoServerError):
-        conn.get_group('not-group')
-
-
-@mock_iam()
-def test_get_group_current():
-    conn = boto3.client('iam', region_name='us-east-1')
-    conn.create_group(GroupName='my-group')
-    result = conn.get_group(GroupName='my-group')
-
-    assert result['Group']['Path'] == '/'
-    assert result['Group']['GroupName'] == 'my-group'
-    assert isinstance(result['Group']['CreateDate'], datetime)
-    assert result['Group']['GroupId']
-    assert result['Group']['Arn'] == 'arn:aws:iam::123456789012:group/my-group'
-    assert not result['Users']
-
-    # Make a group with a different path:
-    other_group = conn.create_group(GroupName='my-other-group', Path='some/location')
-    assert other_group['Group']['Path'] == 'some/location'
-    assert other_group['Group']['Arn'] == 'arn:aws:iam::123456789012:group/some/location/my-other-group'
-
-
-@mock_iam_deprecated()
-def test_get_all_groups():
-    conn = boto.connect_iam()
-    conn.create_group('my-group1')
-    conn.create_group('my-group2')
-    groups = conn.get_all_groups()['list_groups_response'][
-        'list_groups_result']['groups']
-    groups.should.have.length_of(2)
-
-
-@mock_iam_deprecated()
-def test_add_user_to_group():
-    conn = boto.connect_iam()
-    with assert_raises(BotoServerError):
-        conn.add_user_to_group('my-group', 'my-user')
-    conn.create_group('my-group')
-    with assert_raises(BotoServerError):
-        conn.add_user_to_group('my-group', 'my-user')
-    conn.create_user('my-user')
-    conn.add_user_to_group('my-group', 'my-user')
-
-
-@mock_iam_deprecated()
-def test_remove_user_from_group():
-    conn = boto.connect_iam()
-    with assert_raises(BotoServerError):
-        conn.remove_user_from_group('my-group', 'my-user')
-    conn.create_group('my-group')
-    conn.create_user('my-user')
-    with assert_raises(BotoServerError):
-        conn.remove_user_from_group('my-group', 'my-user')
-    conn.add_user_to_group('my-group', 'my-user')
-    conn.remove_user_from_group('my-group', 'my-user')
-
-
-@mock_iam_deprecated()
-def test_get_groups_for_user():
-    conn = boto.connect_iam()
-    conn.create_group('my-group1')
-    conn.create_group('my-group2')
-    conn.create_group('other-group')
-    conn.create_user('my-user')
-    conn.add_user_to_group('my-group1', 'my-user')
-    conn.add_user_to_group('my-group2', 'my-user')
-
-    groups = conn.get_groups_for_user(
-        'my-user')['list_groups_for_user_response']['list_groups_for_user_result']['groups']
-    groups.should.have.length_of(2)
-
-
-@mock_iam_deprecated()
-def test_put_group_policy():
-    conn = boto.connect_iam()
-    conn.create_group('my-group')
-    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
-
-
-@mock_iam
-def test_attach_group_policies():
-    conn = boto3.client('iam', region_name='us-east-1')
-    conn.create_group(GroupName='my-group')
-    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
-    policy_arn = 'arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforEC2Role'
-    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
-    conn.attach_group_policy(GroupName='my-group', PolicyArn=policy_arn)
-    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.equal(
-        [
-            {
-                'PolicyName': 'AmazonElasticMapReduceforEC2Role',
-                'PolicyArn': policy_arn,
-            }
-        ])
-
-    conn.detach_group_policy(GroupName='my-group', PolicyArn=policy_arn)
-    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
-
-
-@mock_iam_deprecated()
-def test_get_group_policy():
-    conn = boto.connect_iam()
-    conn.create_group('my-group')
-    with assert_raises(BotoServerError):
-        conn.get_group_policy('my-group', 'my-policy')
-
-    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
-    conn.get_group_policy('my-group', 'my-policy')
-
-
-@mock_iam_deprecated()
-def test_get_all_group_policies():
-    conn = boto.connect_iam()
-    conn.create_group('my-group')
-    policies = conn.get_all_group_policies('my-group')['list_group_policies_response']['list_group_policies_result']['policy_names']
-    assert policies == []
-    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
-    policies = conn.get_all_group_policies('my-group')['list_group_policies_response']['list_group_policies_result']['policy_names']
-    assert policies == ['my-policy']
-
-
-@mock_iam()
-def test_list_group_policies():
-    conn = boto3.client('iam', region_name='us-east-1')
-    conn.create_group(GroupName='my-group')
-    conn.list_group_policies(GroupName='my-group')['PolicyNames'].should.be.empty
-    conn.put_group_policy(GroupName='my-group', PolicyName='my-policy', PolicyDocument='{"some": "json"}')
-    conn.list_group_policies(GroupName='my-group')['PolicyNames'].should.equal(['my-policy'])
+from __future__ import unicode_literals
+
+from datetime import datetime
+
+import boto
+import boto3
+import sure  # noqa
+
+from nose.tools import assert_raises
+from boto.exception import BotoServerError
+from moto import mock_iam, mock_iam_deprecated
+
+
+@mock_iam_deprecated()
+def test_create_group():
+    conn = boto.connect_iam()
+    conn.create_group('my-group')
+    with assert_raises(BotoServerError):
+        conn.create_group('my-group')
+
+
+@mock_iam_deprecated()
+def test_get_group():
+    conn = boto.connect_iam()
+    conn.create_group('my-group')
+    conn.get_group('my-group')
+    with assert_raises(BotoServerError):
+        conn.get_group('not-group')
+
+
+@mock_iam()
+def test_get_group_current():
+    conn = boto3.client('iam', region_name='us-east-1')
+    conn.create_group(GroupName='my-group')
+    result = conn.get_group(GroupName='my-group')
+
+    assert result['Group']['Path'] == '/'
+    assert result['Group']['GroupName'] == 'my-group'
+    assert isinstance(result['Group']['CreateDate'], datetime)
+    assert result['Group']['GroupId']
+    assert result['Group']['Arn'] == 'arn:aws:iam::123456789012:group/my-group'
+    assert not result['Users']
+
+    # Make a group with a different path:
+    other_group = conn.create_group(GroupName='my-other-group', Path='some/location')
+    assert other_group['Group']['Path'] == 'some/location'
+    assert other_group['Group']['Arn'] == 'arn:aws:iam::123456789012:group/some/location/my-other-group'
+
+
+@mock_iam_deprecated()
+def test_get_all_groups():
+    conn = boto.connect_iam()
+    conn.create_group('my-group1')
+    conn.create_group('my-group2')
+    groups = conn.get_all_groups()['list_groups_response'][
+        'list_groups_result']['groups']
+    groups.should.have.length_of(2)
+
+
+@mock_iam_deprecated()
+def test_add_user_to_group():
+    conn = boto.connect_iam()
+    with assert_raises(BotoServerError):
+        conn.add_user_to_group('my-group', 'my-user')
+    conn.create_group('my-group')
+    with assert_raises(BotoServerError):
+        conn.add_user_to_group('my-group', 'my-user')
+    conn.create_user('my-user')
+    conn.add_user_to_group('my-group', 'my-user')
+
+
+@mock_iam_deprecated()
+def test_remove_user_from_group():
+    conn = boto.connect_iam()
+    with assert_raises(BotoServerError):
+        conn.remove_user_from_group('my-group', 'my-user')
+    conn.create_group('my-group')
+    conn.create_user('my-user')
+    with assert_raises(BotoServerError):
+        conn.remove_user_from_group('my-group', 'my-user')
+    conn.add_user_to_group('my-group', 'my-user')
+    conn.remove_user_from_group('my-group', 'my-user')
+
+
+@mock_iam_deprecated()
+def test_get_groups_for_user():
+    conn = boto.connect_iam()
+    conn.create_group('my-group1')
+    conn.create_group('my-group2')
+    conn.create_group('other-group')
+    conn.create_user('my-user')
+    conn.add_user_to_group('my-group1', 'my-user')
+    conn.add_user_to_group('my-group2', 'my-user')
+
+    groups = conn.get_groups_for_user(
+        'my-user')['list_groups_for_user_response']['list_groups_for_user_result']['groups']
+    groups.should.have.length_of(2)
+
+
+@mock_iam_deprecated()
+def test_put_group_policy():
+    conn = boto.connect_iam()
+    conn.create_group('my-group')
+    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
+
+
+@mock_iam
+def test_attach_group_policies():
+    conn = boto3.client('iam', region_name='us-east-1')
+    conn.create_group(GroupName='my-group')
+    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
+    policy_arn = 'arn:aws:iam::aws:policy/service-role/AmazonElasticMapReduceforEC2Role'
+    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
+    conn.attach_group_policy(GroupName='my-group', PolicyArn=policy_arn)
+    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.equal(
+        [
+            {
+                'PolicyName': 'AmazonElasticMapReduceforEC2Role',
+                'PolicyArn': policy_arn,
+            }
+        ])
+
+    conn.detach_group_policy(GroupName='my-group', PolicyArn=policy_arn)
+    conn.list_attached_group_policies(GroupName='my-group')['AttachedPolicies'].should.be.empty
+
+
+@mock_iam_deprecated()
+def test_get_group_policy():
+    conn = boto.connect_iam()
+    conn.create_group('my-group')
+    with assert_raises(BotoServerError):
+        conn.get_group_policy('my-group', 'my-policy')
+
+    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
+    conn.get_group_policy('my-group', 'my-policy')
+
+
+@mock_iam_deprecated()
+def test_get_all_group_policies():
+    conn = boto.connect_iam()
+    conn.create_group('my-group')
+    policies = conn.get_all_group_policies('my-group')['list_group_policies_response']['list_group_policies_result']['policy_names']
+    assert policies == []
+    conn.put_group_policy('my-group', 'my-policy', '{"some": "json"}')
+    policies = conn.get_all_group_policies('my-group')['list_group_policies_response']['list_group_policies_result']['policy_names']
+    assert policies == ['my-policy']
+
+
+@mock_iam()
+def test_list_group_policies():
+    conn = boto3.client('iam', region_name='us-east-1')
+    conn.create_group(GroupName='my-group')
+    conn.list_group_policies(GroupName='my-group')['PolicyNames'].should.be.empty
+    conn.put_group_policy(GroupName='my-group', PolicyName='my-policy', PolicyDocument='{"some": "json"}')
+    conn.list_group_policies(GroupName='my-group')['PolicyNames'].should.equal(['my-policy'])

tests/test_iam/test_server.py

@@ -1,26 +1,26 @@
-from __future__ import unicode_literals
-
-import json
-
-import re
-import sure  # noqa
-
-import moto.server as server
-
-'''
-Test the different server responses
-'''
-
-
-def test_iam_server_get():
-    backend = server.create_backend_app("iam")
-    test_client = backend.test_client()
-
-    group_data = test_client.action_data(
-        "CreateGroup", GroupName="test group", Path="/")
-    group_id = re.search("<GroupId>(.*)</GroupId>", group_data).groups()[0]
-
-    groups_data = test_client.action_data("ListGroups")
-    groups_ids = re.findall("<GroupId>(.*)</GroupId>", groups_data)
-
-    assert group_id in groups_ids
+from __future__ import unicode_literals
+
+import json
+
+import re
+import sure  # noqa
+
+import moto.server as server
+
+'''
+Test the different server responses
+'''
+
+
+def test_iam_server_get():
+    backend = server.create_backend_app("iam")
+    test_client = backend.test_client()
+
+    group_data = test_client.action_data(
+        "CreateGroup", GroupName="test group", Path="/")
+    group_id = re.search("<GroupId>(.*)</GroupId>", group_data).groups()[0]
+
+    groups_data = test_client.action_data("ListGroups")
+    groups_ids = re.findall("<GroupId>(.*)</GroupId>", groups_data)
+
+    assert group_id in groups_ids