diff options
| author | Balazs Gibizer <gibi@redhat.com> | 2022-08-08 19:44:41 +0200 |
|---|---|---|
| committer | Balazs Gibizer <gibi@redhat.com> | 2022-08-08 19:50:02 +0200 |
| commit | bf654e3a4a8f690ad0bec0955690bf4fadf98dba (patch) | |
| tree | 387fcbdbc1ea58b144baf2bddb4222338a01db8c /.zuul.yaml | |
| parent | adeea3d5e7d7337d2817dd5c46334c76c05995ef (diff) | |
| download | nova-bf654e3a4a8f690ad0bec0955690bf4fadf98dba.tar.gz | |
Remove double mocking... again
I thought we fixed all the double mocking issues with
I3998d0d49583806ac1c3ae64f1b1fe343cefd20d but I was wrong.
While we used both mock and unittest.mock the fixtures.MockPatch
used the mock lib instead of the unittest.mock lib.
The path Ibf4f36136f2c65adad64f75d665c00cf2de4b400 (Remove the PowerVM driver)
removed the last user of mock lib from nova. So it is also
removed the mock from test-requirements. This triggered that
fixtures.MockPatch athat started using unittest.mock too.
Before Ibf4f36136f2c65adad64f75d665c00cf2de4b400 a function can be mocked
twice once with unittest.mock and once with fixtures.MockPatch (still
using mock). However after that patch both path of such double
mocking goes through unittest.mock and the second one fails.
So this patch fixes double mocking so far hidden behind
fixtures.MockPatch.
Also this patch makes the py310 and functional-py310 jobs voting at
least in the check queue to prevent future changes adding double mocks.
Change-Id: Ic1352ec31996577a5d0ad18a057339df3e49de25
Diffstat (limited to '.zuul.yaml')
| -rw-r--r-- | .zuul.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index d4eb61e77d..79c4043e38 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -665,7 +665,9 @@ - nova-tox-functional-py38 - nova-tox-functional-py39 - nova-tox-functional-py310: - voting: false + voting: true + - openstack-tox-py310: + voting: true - tempest-integrated-compute: # NOTE(gmann): Policies changes do not need to run all the # integration test jobs. Running only tempest and grenade |