Merge branch 'master' into scan_filter_expression

.travis.yml

@@ -25,7 +25,8 @@ install:
     travis_retry pip install boto==2.45.0
     travis_retry pip install boto3
     travis_retry pip install dist/moto*.gz
-    travis_retry pip install coveralls==1.1
+    travis_retry pip install coveralls
+    travis_retry pip install codecov
     travis_retry pip install -r requirements-dev.txt
 
     if [ "$TEST_SERVER_MODE" = "true" ]; then
@@ -35,3 +36,4 @@ script:
   - make test
 after_success:
   - coveralls
+  - codecov

moto/ec2/utils.py

@@ -51,7 +51,7 @@ def random_ami_id():
 
 
 def random_instance_id():
-    return random_id(prefix=EC2_RESOURCE_TO_PREFIX['instance'])
+    return random_id(prefix=EC2_RESOURCE_TO_PREFIX['instance'], size=17)
 
 
 def random_reservation_id():