Skip to content

Commit

Permalink
Use 'docker rm' instead of 'kill'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewsomething committed Oct 19, 2015
1 parent 03c4fb8 commit 0b797d1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Expand Up @@ -9,11 +9,6 @@ before_install:
install:
- pip install fabric
- pip install nose
# place apparmor docker profile in complain mode
# to workaround https://github.com/travis-ci/travis-ci/issues/4661
- sudo apt-get -y update
- sudo apt-get -y install apparmor-utils
- sudo aa-complain /etc/apparmor.d/docker
script:
- sudo service docker restart; sleep 10
- nosetests -v
2 changes: 1 addition & 1 deletion tests/test_apt.py
Expand Up @@ -37,7 +37,7 @@ def setUp(self):

def tearDown(self):
print('Destroying Docker container...')
return docker('kill %s' % self.container)
return docker('rm -f %s' % self.container)

def test_update(self):
with settings(host_string=self.container_host,
Expand Down

0 comments on commit 0b797d1

Please sign in to comment.