Commit b7a2dc55 authored by Nicolas Wavrant's avatar Nicolas Wavrant

fixup! slaprunner: test support of multiple software release

parent 948f5f54
...@@ -36,6 +36,7 @@ import subprocess ...@@ -36,6 +36,7 @@ import subprocess
import time import time
import unittest import unittest
from datetime import datetime
from lxml import etree from lxml import etree
from lxml.html import soupparser from lxml.html import soupparser
...@@ -359,6 +360,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase): ...@@ -359,6 +360,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase):
return resp return resp
def _buildAndRun(self): def _buildAndRun(self):
start_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
self.logger.debug('Running Build&Run') self.logger.debug('Running Build&Run')
self._call('runSoftwareProfile') self._call('runSoftwareProfile')
while True: while True:
...@@ -376,7 +378,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase): ...@@ -376,7 +378,7 @@ class TestSlapProxyIntegration(SlaprunnerTestCase):
continue continue
if result['software']['success'] == 0: if result['software']['success'] == 0:
if result['instance']['success'] == 0: if result['instance']['success'] == 0 and start_date < result['instance']['last_build'].encode():
self.logger.debug('Instance is up!') self.logger.debug('Instance is up!')
# Done # Done
return return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment