Commit 1eb525b

committed

Avoid race condition during RSpec tests... Python takes a tick before grabbing port 8080 on Travis CI ;-)

Change-Id: I70c081476fdbc401f6709b05cdf87647b79f6cf2

1 parent d905da4 commit 1eb525bCopy full SHA for 1eb525b

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ source "https://rubygems.org"`
`2`	`2`
`3`	`3`	`group :test do`
`4`	`4`	`gem 'rake'`
	`5`	`+ gem 'rspec-wait'`
`5`	`6`	`gem 'git'`
`6`	`7`	`gem 'docker-api'`
`7`	`8`	`gem 'serverspec', '~> 2.24' # Docker 1.8 support`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,11 @@ def image`
`79`	`79`	`end`
`80`	`80`
`81`	`81`	`describe port(8080) do`
`82`		`- it { should be_listening }`
	`82`	`+ # Avoid race condition when python is running but hasn't grabbed the port yet...`
	`83`	`+ it "grabs port 8080" do`
	`84`	`+ wait_for { port(8080) }.to be_listening`
	`85`	`+ end`
	`86`	`+ it { is_expected.to be_listening }`
`83`	`87`	`end`
`84`	`88`
`85`	`89`	`context "when serving a test file" do`
`@@ -107,6 +111,14 @@ def image`
`107`	`111`	`it { should be_file }`
`108`	`112`	`end`
`109`	`113`
	`114`	`+ describe port(8080) do`
	`115`	`+ # Avoid race condition when python is running but hasn't grabbed the port yet...`
	`116`	`+ it "grabs port 8080" do`
	`117`	`+ wait_for { port(8080) }.to be_listening`
	`118`	`+ end`
	`119`	`+ it { is_expected.to be_listening }`
	`120`	`+ end`
	`121`	`+`
`110`	`122`	`describe command('wget -O - http://localhost:8080/helloworld.txt') do`
`111`	`123`	`its(:stdout) { should match /^hello simple world$/ }`
`112`	`124`	`its(:stderr) { is_expected.not_to match /can't connect/ }`

Lines changed: 1 addition & 0 deletions

Comments

(0)