valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

undo test

Browse Source
This commit is contained in:
cmcmarrow 2019-07-22 07:35:24 -06:00
parent bc550adce6
commit 592f3fe945
No known key found for this signature in database
GPG Key ID: 62FAA6B3AC79AD2F
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/integration/__init__.py
View File

@ -265,7 +265,6 @@ class TestDaemon(object):
salt.utils.process.appendproctitle('{0}-{1}'.format(self.__class__.__name__, cls.__name__))
daemon = cls(opts)
getattr(daemon, start_fun)()
multiprocessing.log_to_stderr(logging.DEBUG) ## DGM
process = multiprocessing.Process(target=start,
args=(cls, opts, start_fun))
process.start()
@ -304,7 +303,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting salt-master ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -313,9 +312,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting salt-master ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
try:
@ -343,7 +339,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting salt-minion ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -352,9 +348,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting salt-minion ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
try:
@ -382,7 +375,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting sub salt-minion ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -391,9 +384,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting sub salt-minion ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
try:
@ -422,7 +412,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting syndic salt-master ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -431,9 +421,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting syndic salt-master ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
try:
@ -461,7 +448,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting salt-syndic ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -470,9 +457,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting salt-syndic ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
if self.parser.options.proxy:
@ -502,7 +486,7 @@ class TestDaemon(object):
' * {LIGHT_GREEN}Starting salt-proxy ... STARTED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.flush()
except (RuntimeWarning, RuntimeError) as exc:
except (RuntimeWarning, RuntimeError):
sys.stdout.write(
'\r{0}\r'.format(
' ' * getattr(self.parser.options, 'output_columns', PNUM)
@ -511,9 +495,6 @@ class TestDaemon(object):
sys.stdout.write(
' * {LIGHT_RED}Starting salt-proxy ... FAILED!\n{ENDC}'.format(**self.colors)
)
sys.stdout.write(
'\nexception {0}'.format(exc)
)
sys.stdout.flush()
def start_raet_daemons(self):
@ -1340,4 +1321,4 @@ class TestDaemon(object):
break
if time.time() - start >= timeout:
raise RuntimeError("Ping Minions Failed")
time.sleep(sleep)
time.sleep(sleep)