Misc build related fixes

.travis.yml

@@ -61,7 +61,7 @@ install:
     - pip install codecov
 script:
     - tox -e $TOX_ENV
-after_success:
+after_script:
     - |
       case "$TRAVIS_EVENT_TYPE" in
         push|pull_request)
@@ -78,6 +78,7 @@ after_success:
            ;;
         *)
            echo "Build triggered through API or CRON job. Running regardless of changes"
+           coveralls & codecov & wait
            ;;
       esac
 

setup.cfg

@@ -12,4 +12,5 @@ processes=5
 process-timeout=2700
 match=^[Tt]est 
 # Don't capture stdout - print immediately
-nocapture=1
+nocapture=1
+

test/test_compute_service.py

@@ -183,7 +183,7 @@ class CloudComputeServiceTestCase(ProviderTestBase):
         lc.add_volume_device(
             is_root=True,
             source=img,
-            size=img.min_disk if img and img.min_disk else 30,
+            size=img.min_disk if img and img.min_disk > 30 else 30,
             delete_on_terminate=True)
 
         # Attempting to add more than one root volume should raise an

tox.ini

@@ -18,7 +18,6 @@ envlist = {py27,py36,pypy}-{aws,azure,openstack}
 commands = flake8 cloudbridge test setup.py
            # see setup.cfg for options sent to nosetests and coverage
            {envpython} setup.py nosetests {posargs}
-           coverage combine
 setenv =
     MOTO_AMIS_PATH=./test/fixtures/custom_amis.json
     aws: CB_TEST_PROVIDER=aws