Merge 4bf2d7d into 4234e70

OCA · Jan 22, 2018 · 1c25ff9 · 1c25ff9
2 parents 4234e70 + 4bf2d7d
commit 1c25ff9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis_requirements.sh b/.travis_requirements.sh
@@ -5,7 +5,7 @@ set -v
 export DEPS=${HOME}/dependencies
 # odoo-extra break compatibility because change name of many methods
 # TODO: Test new changes and remove this freeze sha
-(cd $DEPS/odoo-extra; git reset --hard 0c41e17^)
+(cd $DEPS/odoo-extra; git fetch --unshallow; git reset --hard 0c41e17^)
 # odoo-extra has a bunch of v9 modules which aren't compatible, remove them
 (cd $DEPS/odoo-extra; rm -rf $(ls | grep -v runbot$))
 

diff --git a/runbot_travis2docker/tests/test_runbot_build.py b/runbot_travis2docker/tests/test_runbot_build.py
@@ -83,7 +83,7 @@ def tearDown(self):
 
     @mute_logger('openerp.addons.runbot.runbot')
     def wait_change_job(self, current_job, build,
-                        loops=36, timeout=10):
+                        loops=60, timeout=15):
         for loop in range(loops):
             _logger.info("Repo Cron to wait change of state")
             self.repo.cron()