Merge pull request #2334 from dkuntz2/unify-ec2-owner-ids

Use the same default Owner ID between EC2 models

tests/test_ec2/test_amis.py

@@ -10,7 +10,7 @@ from nose.tools import assert_raises
 import sure  # noqa
 
 from moto import mock_ec2_deprecated, mock_ec2
-from moto.ec2.models import AMIS
+from moto.ec2.models import AMIS, OWNER_ID
 from tests.helpers import requires_boto_gte
 
 
@@ -152,6 +152,29 @@ def test_ami_copy():
     cm.exception.request_id.should_not.be.none
 
 
+@mock_ec2
+def test_copy_image_changes_owner_id():
+    conn = boto3.client('ec2', region_name='us-east-1')
+
+    # this source AMI ID is from moto/ec2/resources/amis.json
+    source_ami_id = "ami-03cf127a"
+
+    # confirm the source ami owner id is different from the default owner id.
+    # if they're ever the same it means this test is invalid.
+    check_resp = conn.describe_images(ImageIds=[source_ami_id])
+    check_resp["Images"][0]["OwnerId"].should_not.equal(OWNER_ID)
+
+    copy_resp = conn.copy_image(
+        SourceImageId=source_ami_id,
+        Name="new-image",
+        Description="a copy of an image",
+        SourceRegion="us-east-1")
+
+    describe_resp = conn.describe_images(Owners=["self"])
+    describe_resp["Images"][0]["OwnerId"].should.equal(OWNER_ID)
+    describe_resp["Images"][0]["ImageId"].should.equal(copy_resp["ImageId"])
+
+
 @mock_ec2_deprecated
 def test_ami_tagging():
     conn = boto.connect_vpc('the_key', 'the_secret')

tests/test_ec2/test_elastic_block_store.py

@@ -12,6 +12,7 @@ from freezegun import freeze_time
 import sure  # noqa
 
 from moto import mock_ec2_deprecated, mock_ec2
+from moto.ec2.models import OWNER_ID
 
 
 @mock_ec2_deprecated
@@ -395,7 +396,7 @@ def test_snapshot_filters():
         ).should.equal({snapshot3.id})
 
     snapshots_by_owner_id = conn.get_all_snapshots(
-        filters={'owner-id': '123456789012'})
+        filters={'owner-id': OWNER_ID})
     set([snap.id for snap in snapshots_by_owner_id]
         ).should.equal({snapshot1.id, snapshot2.id, snapshot3.id})