Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into scan_filter_expression

Browse Source
This commit is contained in:
Terry Cain 2017-10-08 04:31:34 +01:00
commit 35a69d9f61
No known key found for this signature in database
GPG Key ID: 14D90844E4E9B9F3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

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

2
moto/ec2/utils.py
View File

@ -51,7 +51,7 @@ def random_ami_id():
def random_instance_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(): def random_reservation_id():