projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
retest
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
base.py
diff --git
a/src/emuvim/test/base.py
b/src/emuvim/test/base.py
index
d5329a9
..
5a83547
100644
(file)
--- a/
src/emuvim/test/base.py
+++ b/
src/emuvim/test/base.py
@@
-57,7
+57,7
@@
class SimpleTestTopology(unittest.TestCase):
self.h.append(self.net.addHost('h%d' % i))
# add some dockers
for i in range(0, ndockers):
self.h.append(self.net.addHost('h%d' % i))
# add some dockers
for i in range(0, ndockers):
- self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu"))
+ self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu
:trusty
"))
def startNet(self):
self.net.start()
def startNet(self):
self.net.start()
@@
-74,11
+74,11
@@
class SimpleTestTopology(unittest.TestCase):
base_url='unix://var/run/docker.sock')
return self.docker_cli
base_url='unix://var/run/docker.sock')
return self.docker_cli
- def get
Dock
ernetContainers(self):
+ def get
Contain
ernetContainers(self):
"""
"""
- List the containers managed by
dock
ernet
+ List the containers managed by
contain
ernet
"""
"""
- return self.getDockerCli().containers(filters={"label": "com.
dock
ernet"})
+ return self.getDockerCli().containers(filters={"label": "com.
contain
ernet"})
@staticmethod
def setUp():
@staticmethod
def setUp():
@@
-90,7
+90,7
@@
class SimpleTestTopology(unittest.TestCase):
# make sure that all pending docker containers are killed
with open(os.devnull, 'w') as devnull:
subprocess.call(
# make sure that all pending docker containers are killed
with open(os.devnull, 'w') as devnull:
subprocess.call(
- "sudo docker rm -f $(sudo docker ps --filter 'label=com.
dock
ernet' -a -q)",
+ "sudo docker rm -f $(sudo docker ps --filter 'label=com.
contain
ernet' -a -q)",
stdout=devnull,
stderr=devnull,
shell=True)
\ No newline at end of file
stdout=devnull,
stderr=devnull,
shell=True)
\ No newline at end of file