0001-esirius_swi-correct-closed-status-computation-62133.patch

Nicolas Roche, 24 février 2022 12:01

Voir les différences: en ligne côte à côte

Subject: [PATCH] esirius_swi: correct closed status computation (#62133)

 passerelle/contrib/esirius_swi/utils.py | 4 ++--
 tests/test_esirius_swi.py               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

passerelle/contrib/esirius_swi/utils.py
13	13	#
14	14	# You should have received a copy of the GNU Affero General Public License
15	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16
17	17
18	18	def compute_status(data):
19	19	data.update(
20	20	{
21		'closed': not data['resourceNumber'] or data['estimatedAvgWaitingTime'] == '-',
	21	'closed': not data['resourceNumber'],
22	22	'estimatedAvgWaitingTimeInMinutes': None,
23	23	}
24	24	)
25		if not data['closed']:
	25	if not data['closed'] and data['estimatedAvgWaitingTime'] != '-':
26	26	values = [int(x) for x in data['estimatedAvgWaitingTime'].split(':')]
27	27	data['estimatedAvgWaitingTimeInMinutes'] = 60 * values[0] + values[1] + 1

         assert resp.json['err'] == 1
         assert resp.json['err_desc'] == "'NoneType' object has no attribute 'getroottree'"
     @pytest.mark.parametrize(
         'resource, time, closed, minutes',
+        [
             (0, '00:01:39', True, None),
             (1, '-', True, None),
             (1, '-', False, None),
             (2, '00:01:39', False, 2),
             (99, '01:59:00', False, 120),
         ],
+    )
     def test_status(resource, time, closed, minutes):
         data = {
             'resourceNumber': resource,
             'estimatedAvgWaitingTime': time,
+    -

Produits Entr'ouvert » Passerelle