tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3504 from denismakogon/issue-3503 

Issue-3503: Improve timestamp validation in tests
This commit is contained in:
Joffrey F 2016-06-03 11:57:55 -07:00
parent 17b219454f 1298b9aa5d
commit 427ec899df
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/acceptance/cli_test.py
View File

@ -1473,6 +1473,17 @@ class CLITestCase(DockerClientTestCase):
assert Counter(e['action'] for e in lines) == {'create': 2, 'start': 2} assert Counter(e['action'] for e in lines) == {'create': 2, 'start': 2}
def test_events_human_readable(self): def test_events_human_readable(self):
def has_timestamp(string):
str_iso_date, str_iso_time, container_info = string.split(' ', 2)
try:
return isinstance(datetime.datetime.strptime(
'%s %s' % (str_iso_date, str_iso_time),
'%Y-%m-%d %H:%M:%S.%f'),
datetime.datetime)
except ValueError:
return False
events_proc = start_process(self.base_dir, ['events']) events_proc = start_process(self.base_dir, ['events'])
self.dispatch(['up', '-d', 'simple']) self.dispatch(['up', '-d', 'simple'])
wait_on_condition(ContainerCountCondition(self.project, 1)) wait_on_condition(ContainerCountCondition(self.project, 1))
@ -1489,7 +1500,8 @@ class CLITestCase(DockerClientTestCase):
assert expected_template.format('create', container.id) in lines[0] assert expected_template.format('create', container.id) in lines[0]
assert expected_template.format('start', container.id) in lines[1] assert expected_template.format('start', container.id) in lines[1]
assert lines[0].startswith(datetime.date.today().isoformat())
assert has_timestamp(lines[0])
def test_env_file_relative_to_compose_file(self): def test_env_file_relative_to_compose_file(self):
config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml') config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')