Use gpg hosted by docker instead and 2 seconds waiting doesn't seem t…

…o be enough for Wordpress 4.9 on travis.
tinify · Jul 30, 2018 · cb4e462 · cb4e462
1 parent d090795
commit cb4e462
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/install-docker b/bin/install-docker
@@ -15,7 +15,7 @@ rm -f $(which docker)
 rm -f $(which docker-compose)
 
 set -e
-apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | tee /etc/apt/sources.list.d/docker.list
 echo "deb https://apt.dockerproject.org/repo ubuntu-trusty testing" | tee -a /etc/apt/sources.list.d/docker.list
 apt-get update

diff --git a/test/helpers/setup.php b/test/helpers/setup.php
@@ -164,7 +164,7 @@ function login( $driver ) {
 		$driver->findElement( WebDriverBy::id( 'loginform' ) )->submit();
 
 		$driver
-			->wait( 2 )
+			->wait( 5 )
 			->until(
 				WebDriverExpectedCondition::presenceOfElementLocated(
 					WebDriverBy::cssSelector( 'div.wrap h1, div.wrap h2' )