Fix tests - remove setup from _init_
This commit is contained in:
parent
d78d709537
commit
ea223232ab
@ -1,11 +1,8 @@
|
|||||||
import time, os
|
import time, os
|
||||||
|
|
||||||
from devops.model import Environment, Network, Node, Disk, Cdrom, Interface
|
from devops.model import Environment, Network, Node, Disk, Cdrom, Interface
|
||||||
from devops.controller import Controller
|
from devops.helpers import tcp_ping, wait
|
||||||
from devops.driver.libvirt import Libvirt
|
|
||||||
from devops.helpers import tcp_ping, wait, TimeoutError
|
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import devops
|
import devops
|
||||||
|
|
||||||
@ -148,12 +145,3 @@ class Ci(object):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
ci = None
|
ci = None
|
||||||
|
|
||||||
def setUp():
|
|
||||||
if not ci.setup_environment():
|
|
||||||
raise Exception, "Failed to setup integration environment"
|
|
||||||
|
|
||||||
def tearDown():
|
|
||||||
if not ci.environment_cache_file:
|
|
||||||
ci.destroy_environment()
|
|
||||||
|
|
||||||
|
@ -1,21 +1,13 @@
|
|||||||
import shlex
|
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
import urllib2
|
|
||||||
import pprint
|
import pprint
|
||||||
from unittest import TestCase
|
|
||||||
from subprocess import Popen, PIPE
|
|
||||||
#import posixpath
|
|
||||||
import paramiko
|
|
||||||
import posixpath
|
import posixpath
|
||||||
from devops.helpers import wait, tcp_ping, http
|
from devops.helpers import wait, tcp_ping, http
|
||||||
from integration import ci
|
from integration import ci
|
||||||
|
|
||||||
from integration.base import Base
|
from integration.base import Base
|
||||||
from helpers import HTTPClient, SSHClient
|
from helpers import SSHClient
|
||||||
from root import root
|
from root import root
|
||||||
|
|
||||||
logging.basicConfig(format=':%(lineno)d: %(asctime)s %(message)s', level=logging.DEBUG)
|
logging.basicConfig(format=':%(lineno)d: %(asctime)s %(message)s', level=logging.DEBUG)
|
||||||
@ -93,7 +85,7 @@ class TestNode(Base):
|
|||||||
release_remote_path
|
release_remote_path
|
||||||
logging.info("Launching command: %s" % cmd)
|
logging.info("Launching command: %s" % cmd)
|
||||||
res = self.remote.execute(cmd)
|
res = self.remote.execute(cmd)
|
||||||
if res['exit_status'] != 0:
|
if res['exit_status']:
|
||||||
self.remote.disconnect()
|
self.remote.disconnect()
|
||||||
raise Exception("Command failed: %s" % str(res))
|
raise Exception("Command failed: %s" % str(res))
|
||||||
attempts += 1
|
attempts += 1
|
||||||
|
@ -45,7 +45,7 @@ def main():
|
|||||||
suite = integration
|
suite = integration
|
||||||
elif params.test_suite == 'cookbooks':
|
elif params.test_suite == 'cookbooks':
|
||||||
suite = cookbooks
|
suite = cookbooks
|
||||||
|
# todo fix default values
|
||||||
suite.ci = suite.Ci(params.cache_file, params.iso)
|
suite.ci = suite.Ci(params.cache_file, params.iso)
|
||||||
suite.ci.installation_timeout = getattr(params, 'installation_timeout', 1800)
|
suite.ci.installation_timeout = getattr(params, 'installation_timeout', 1800)
|
||||||
suite.ci.chef_timeout = getattr(params, 'chef_timeout', 600)
|
suite.ci.chef_timeout = getattr(params, 'chef_timeout', 600)
|
||||||
|
Loading…
Reference in New Issue
Block a user