From 0098a798509598280bd682a25dedd9500e604ffc Mon Sep 17 00:00:00 2001 From: Zuul Date: Wed, 22 Jan 2020 06:20:52 +0000 Subject: [PATCH] Update git submodules * Update heat-dashboard from branch 'master' - Merge "Remove six usage (2/2)" - Remove six usage (2/2) This repo does not support Python 2 anymore, so we don't need six for compatibility between Python2 and 3, convert six usage to Python 3 code. This changes urllib usage. mock.patch usage in heat_dashboard/test/tests/api/test_heat.py is modified to cope with the mix usage of urllib from python3 (in heat-dashboard) and six.moves.urllib (in heatclient). In the case of the mix usage, patching urllib.request.urlopen() only does not work as urllib.request.urlopen() is not called after resolving a lazy loading in six and the resolved object is six.moves.urllib.request is called. The previous code depends on the behavior in heatclient read_url_content() and the method should be mocked instead. Considering this, mocking in api/test_heat.py is modified to mock direct methods called in the heat-dashboard code. Co-Authored-By: Akihiro Motoki Change-Id: Icf3f889770242b02023fe22c405cfa2d823581a5 Needed-By: https://review.opendev.org/701743 --- heat-dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat-dashboard b/heat-dashboard index 5326586380..7842190851 160000 --- a/heat-dashboard +++ b/heat-dashboard @@ -1 +1 @@ -Subproject commit 53265863803dcb4760468570dad5161ccf1ac7a4 +Subproject commit 78421908513eec5366fda3081e47c085ad2f89d0