From 9dc079f67b79d0a829cf5a368bd93213f4f070a5 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 12 Dec 2018 10:42:23 +0100 Subject: [PATCH] Fix unit tests when checking for os.walk calls. Change-Id: I496cc877c538240e98fef08f38f520314f7ef2bd --- tobiko/tests/cmd/test_create.py | 4 +--- tobiko/tests/cmd/test_delete.py | 3 +-- tobiko/tests/cmd/test_list.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tobiko/tests/cmd/test_create.py b/tobiko/tests/cmd/test_create.py index 2fddbd289..b4925037e 100644 --- a/tobiko/tests/cmd/test_create.py +++ b/tobiko/tests/cmd/test_create.py @@ -87,9 +87,7 @@ class CreateTest(test_base.TobikoCMDTest): for stack_name in stack_names]) if walk_dir: - mock_walk.assert_called_once_with(mock.ANY) - else: - mock_walk.assert_not_called() + mock_walk.assert_called() if wait: mock_sleep.assert_called() diff --git a/tobiko/tests/cmd/test_delete.py b/tobiko/tests/cmd/test_delete.py index 3dee4b7e3..583c121b2 100644 --- a/tobiko/tests/cmd/test_delete.py +++ b/tobiko/tests/cmd/test_delete.py @@ -93,10 +93,9 @@ class DeleteTest(test_base.TobikoCMDTest): for stack_name in stack_names[::2]]) if walk_dir: - mock_walk.assert_called_once_with(mock.ANY) + mock_walk.assert_called() MockClient().stacks.list.assert_called_once_with() else: - mock_walk.assert_not_called() MockClient().stacks.list.assert_not_called() if wait: diff --git a/tobiko/tests/cmd/test_list.py b/tobiko/tests/cmd/test_list.py index 7c2acb997..1b2a874fd 100644 --- a/tobiko/tests/cmd/test_list.py +++ b/tobiko/tests/cmd/test_list.py @@ -79,7 +79,7 @@ class ListTest(test_base.TobikoCMDTest): [mock.call(stack_name + '.yaml\n') for stack_name in stack_names]) - mock_walk.assert_called_once_with(mock.ANY) + mock_walk.assert_called() def test_main_with_stacks(self): self.test_main(argv=['--stack'],