Adding server mode

tests/test_ec2/test_amis.py

@@ -9,7 +9,7 @@ from moto import mock_ec2
 @mock_ec2
 def test_ami_create_and_delete():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
     image = conn.create_image(instance.id, "test-ami", "this is a test ami")
 
@@ -23,13 +23,14 @@ def test_ami_create_and_delete():
 @mock_ec2
 def test_ami_create_from_missing_instance():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    conn.create_image.when.called_with("i-abcdefg", "test-ami", "this is a test ami").should.throw(EC2ResponseError)
+    args = ["i-abcdefg", "test-ami", "this is a test ami"]
+    conn.create_image.when.called_with(*args).should.throw(EC2ResponseError)
 
 
 @mock_ec2
 def test_ami_pulls_attributes_from_instance():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
     instance.modify_attribute("kernel", "test-kernel")
 

tests/test_ec2/test_elastic_block_store.py

@@ -1,7 +1,6 @@
 import boto
 from boto.exception import EC2ResponseError
-
-from sure import expect
+import sure  # flake8: noqa
 
 from moto import mock_ec2
 
@@ -28,7 +27,7 @@ def test_create_and_delete_volume():
 @mock_ec2
 def test_volume_attach_and_detach():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
     volume = conn.create_volume(80, "us-east-1a")
 
@@ -47,7 +46,8 @@ def test_volume_attach_and_detach():
     volume.update()
     volume.volume_state().should.equal('available')
 
-    conn.detach_volume.when.called_with(volume.id, instance.id, "/dev/sdh").should.throw(EC2ResponseError)
+    conn.detach_volume.when.called_with(
+        volume.id, instance.id, "/dev/sdh").should.throw(EC2ResponseError)
 
 
 @mock_ec2

tests/test_ec2/test_instances.py

@@ -1,14 +1,34 @@
 import boto
 from boto.ec2.instance import Reservation, InstanceAttribute
-from sure import expect
+import sure  # flake8: noqa
 
 from moto import mock_ec2
 
 
+################ Test Readme ###############
+def add_servers(ami_id, count):
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    for index in range(count):
+        conn.run_instances(ami_id)
+
+
+@mock_ec2
+def test_add_servers():
+    add_servers('ami-1234abcd', 2)
+
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservations = conn.get_all_instances()
+    assert len(reservations) == 2
+    instance1 = reservations[0].instances[0]
+    assert instance1.image_id == 'ami-1234abcd'
+
+############################################
+
+
 @mock_ec2
 def test_instance_launch_and_terminate():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     reservation.should.be.a(Reservation)
     reservation.instances.should.have.length_of(1)
     instance = reservation.instances[0]
@@ -31,11 +51,12 @@ def test_instance_launch_and_terminate():
 @mock_ec2
 def test_instance_start_and_stop():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>', min_count=2)
+    reservation = conn.run_instances('ami-1234abcd', min_count=2)
     instances = reservation.instances
     instances.should.have.length_of(2)
 
-    stopped_instances = conn.stop_instances([instance.id for instance in instances])
+    instance_ids = [instance.id for instance in instances]
+    stopped_instances = conn.stop_instances(instance_ids)
 
     for instance in stopped_instances:
         instance.state.should.equal('stopping')
@@ -47,7 +68,7 @@ def test_instance_start_and_stop():
 @mock_ec2
 def test_instance_reboot():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
     instance.reboot()
     instance.state.should.equal('pending')
@@ -56,7 +77,7 @@ def test_instance_reboot():
 @mock_ec2
 def test_instance_attribute_instance_type():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
 
     instance.modify_attribute("instanceType", "m1.small")
@@ -69,11 +90,11 @@ def test_instance_attribute_instance_type():
 @mock_ec2
 def test_instance_attribute_user_data():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
 
     instance.modify_attribute("userData", "this is my user data")
 
     instance_attribute = instance.get_attribute("userData")
     instance_attribute.should.be.a(InstanceAttribute)
-    expect(instance_attribute.get("userData")).should.equal("this is my user data")
+    instance_attribute.get("userData").should.equal("this is my user data")

tests/test_ec2/test_server.py

@@ -0,0 +1,20 @@
+import re
+import sure  # flake8: noqa
+
+import moto.server as server
+
+'''
+Test the different server responses
+'''
+server.configure_urls("ec2")
+
+
+def test_ec2_server_get():
+    test_client = server.app.test_client()
+    res = test_client.get('/?Action=RunInstances&ImageId=ami-60a54009')
+
+    groups = re.search("<instanceId>(.*)</instanceId>", res.data)
+    instance_id = groups.groups()[0]
+
+    res = test_client.get('/?Action=DescribeInstances')
+    res.data.should.contain(instance_id)

tests/test_ec2/test_tags.py

@@ -1,5 +1,5 @@
 import boto
-from sure import expect
+import sure  # flake8: noqa
 
 from moto import mock_ec2
 
@@ -7,7 +7,7 @@ from moto import mock_ec2
 @mock_ec2
 def test_instance_launch_and_terminate():
     conn = boto.connect_ec2('the_key', 'the_secret')
-    reservation = conn.run_instances('<ami-image-id>')
+    reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
 
     instance.add_tag("a key", "some value")