[openaria-Commits] r2715 - in branches/poc-upgrade-om-4.10: . app/lib services/php tests

[fmi...@hephaestos.ovh.adullact.org]

Author: fmichon
Date: 2020-01-08 17:27:25 +0100 (Wed, 08 Jan 2020)
New Revision: 2715

Modified:
branches/poc-upgrade-om-4.10/
branches/poc-upgrade-om-4.10/EXTERNALS.txt
branches/poc-upgrade-om-4.10/app/lib/
branches/poc-upgrade-om-4.10/app/lib/EXTERNALS.txt
branches/poc-upgrade-om-4.10/services/php/
branches/poc-upgrade-om-4.10/services/php/EXTERNALS.txt
branches/poc-upgrade-om-4.10/tests/005_sig.robot
branches/poc-upgrade-om-4.10/tests/pip-requirements.txt
Log:
* Rebase.


Index: branches/poc-upgrade-om-4.10
===================================================================
--- branches/poc-upgrade-om-4.10 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10 2020-01-08 16:27:25 UTC (rev 2715)

Property changes on: branches/poc-upgrade-om-4.10
___________________________________________________________________
Modified: svn:externals
## -3,7 +3,6 ##
#

# framework openmairie_exemple
-core svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/core
-lib svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
-php svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/php
-
+core https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/core
+lib https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
+php https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/php
Modified: svn:mergeinfo
## -35,4 +35,5 ##
/branches/suivi_docs_gen:2043-2060
/branches/trunk_bug_dc_contacts:2165-2171
/branches/trunk_evo_OM_4.6:2168-2201
-/branches/trunk_sur_fmwk_4.9.0:2345-2368
\ No newline at end of property
+/branches/trunk_sur_fmwk_4.9.0:2345-2368
+/trunk:2633-2714
\ No newline at end of property
Modified: branches/poc-upgrade-om-4.10/EXTERNALS.txt
===================================================================
--- branches/poc-upgrade-om-4.10/EXTERNALS.txt 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/EXTERNALS.txt 2020-01-08 16:27:25 UTC (rev 2715)
@@ -3,7 +3,6 @@
#

# framework openmairie_exemple
-core svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/core
-lib svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
-php svn://scm.adullact.net/svnroot/openmairie/openmairie_exemple/branches/4.10.0-develop/php
-
+core https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/core
+lib https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/lib
+php https://scm.adullact.net/anonscm/svn/openmairie/openmairie_exemple/branches/4.10.0-develop/php

Index: branches/poc-upgrade-om-4.10/app/lib
===================================================================
--- branches/poc-upgrade-om-4.10/app/lib 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/app/lib 2020-01-08 16:27:25 UTC (rev 2715)

Property changes on: branches/poc-upgrade-om-4.10/app/lib
___________________________________________________________________
Modified: svn:externals
## -2,8 +2,8 ##
# created by: svn propset svn:externals -F ./EXTERNALS.txt .
#

-chosen svn://scm.adullact.net/svnroot/openmairie/externals/chosen/tags/1.8.3
-fullcalendar svn://scm.adullact.net/svnroot/openmairie/externals/fullcalendar/tags/2.1.1
-jscolor svn://scm.adullact.net/svnroot/openmairie/externals/jscolor
-moments svn://scm.adullact.net/svnroot/openmairie/externals/moments
-datatables svn://scm.adullact.net/svnroot/openmairie/externals/datatables/tags/1.10.2
+chosen https://scm.adullact.net/anonscm/svn/openmairie/externals/chosen/tags/1.8.3
+fullcalendar https://scm.adullact.net/anonscm/svn/openmairie/externals/fullcalendar/tags/2.1.1
+jscolor https://scm.adullact.net/anonscm/svn/openmairie/externals/jscolor
+moments https://scm.adullact.net/anonscm/svn/openmairie/externals/moments
+datatables https://scm.adullact.net/anonscm/svn/openmairie/externals/datatables/tags/1.10.2
Modified: branches/poc-upgrade-om-4.10/app/lib/EXTERNALS.txt
===================================================================
--- branches/poc-upgrade-om-4.10/app/lib/EXTERNALS.txt 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/app/lib/EXTERNALS.txt 2020-01-08 16:27:25 UTC (rev 2715)
@@ -2,8 +2,8 @@
# created by: svn propset svn:externals -F ./EXTERNALS.txt .
#

-chosen svn://scm.adullact.net/svnroot/openmairie/externals/chosen/tags/1.8.3
-fullcalendar svn://scm.adullact.net/svnroot/openmairie/externals/fullcalendar/tags/2.1.1
-jscolor svn://scm.adullact.net/svnroot/openmairie/externals/jscolor
-moments svn://scm.adullact.net/svnroot/openmairie/externals/moments
-datatables svn://scm.adullact.net/svnroot/openmairie/externals/datatables/tags/1.10.2
+chosen https://scm.adullact.net/anonscm/svn/openmairie/externals/chosen/tags/1.8.3
+fullcalendar https://scm.adullact.net/anonscm/svn/openmairie/externals/fullcalendar/tags/2.1.1
+jscolor https://scm.adullact.net/anonscm/svn/openmairie/externals/jscolor
+moments https://scm.adullact.net/anonscm/svn/openmairie/externals/moments
+datatables https://scm.adullact.net/anonscm/svn/openmairie/externals/datatables/tags/1.10.2

Index: branches/poc-upgrade-om-4.10/services/php
===================================================================
--- branches/poc-upgrade-om-4.10/services/php 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/services/php 2020-01-08 16:27:25 UTC (rev 2715)

Property changes on: branches/poc-upgrade-om-4.10/services/php
___________________________________________________________________
Modified: svn:externals
## -2,7 +2,7 ##
# created by: svn propset svn:externals -F ./EXTERNALS.txt .
#
# @package openaria
-# @version SVN : $Id: EXTERNALS.txt 1568 2016-08-02 16:14:49Z softime $
+# @version SVN : $Id: EXTERNALS.txt 1835 2016-09-28 18:22:15Z fmichon $
#

-restler svn://scm.adullact.net/svnroot/openmairie/externals/restler/tags/2.2.0-charset/
+restler https://scm.adullact.net/anonscm/svn/openmairie/externals/restler/tags/2.2.0-charset/
Modified: branches/poc-upgrade-om-4.10/services/php/EXTERNALS.txt
===================================================================
--- branches/poc-upgrade-om-4.10/services/php/EXTERNALS.txt 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/services/php/EXTERNALS.txt 2020-01-08 16:27:25 UTC (rev 2715)
@@ -5,4 +5,4 @@
# @version SVN : $Id$
#

-restler svn://scm.adullact.net/svnroot/openmairie/externals/restler/tags/2.2.0-charset/
+restler https://scm.adullact.net/anonscm/svn/openmairie/externals/restler/tags/2.2.0-charset/

Modified: branches/poc-upgrade-om-4.10/tests/005_sig.robot
===================================================================
--- branches/poc-upgrade-om-4.10/tests/005_sig.robot 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/tests/005_sig.robot 2020-01-08 16:27:25 UTC (rev 2715)
@@ -285,6 +285,7 @@
Element Should Not Be Visible id=btn_valider
# Vérification du message
Element Should Not Be Visible css=#msg_view_programmation div.message
+ Wait Until Keyword Succeeds ${TIMEOUT} ${RETRY_INTERVAL} Element Should Be Visible css=#tableau_propositions
# Vérification des résultats
${visit_etab} = Get Matching Xpath Count //table[@id='tableau_propositions']/tbody/tr
Should Be Equal ${visit_etab} 2 Mauvais nombre de visite(s) listée(s)

Modified: branches/poc-upgrade-om-4.10/tests/pip-requirements.txt
===================================================================
--- branches/poc-upgrade-om-4.10/tests/pip-requirements.txt 2020-01-08 16:22:29 UTC (rev 2714)
+++ branches/poc-upgrade-om-4.10/tests/pip-requirements.txt 2020-01-08 16:27:25 UTC (rev 2715)
@@ -1,12 +1,12 @@
openmairie.devtools==0.4.0
openmairie.robotframework==4.9.10008
-maildump==0.5.5
+maildump==0.5.6
selenium==2.53.6
-robotframework==3.0.3
+robotframework==3.0.4
robotframework-seleniumlibrary==3.1.1
-robotframework-selenium2screenshots==0.8.0
-requests==2.18.4
-robotframework-requests==0.4.7
-Pillow==4.1.1
+robotframework-selenium2screenshots==0.8.1
+requests==2.22.0
+robotframework-requests==0.5.0
+Pillow==6.1.0
robotframework-archivelibrary==0.4.0
-psycopg2==2.7.1
+psycopg2==2.8.3