Hi Tomas,
On Tue, 2011-07-26 at 16:54 +0200, tsedovic(a)redhat.com wrote:
From: Tomas Sedovic <tsedovic(a)redhat.com>
This tends to trip people up: aeolus-configure sets up a Deltacloud server
with the Mock driver on the port 3002.
However, our tests look for the mock dc instance on 3001, which means that to
run the tests, one must start another Mock Deltacloud server.
This makes tests use 3002 instead. Therefore, if you have the Conductor set up
for production (e.g. installed from RPMs), the tests will use the Deltacloud
server that came with it.
Otherwise, you'll still have to start it manually -- listening on the port
3002 from now on.
Snap! Pretty much identical to my "Use port 3002 for mock provider in
tests", so ACK :-)
(Could you ACK my other patches?)
Factory.define :ec2_provider, :parent => :provider do |p|
p.name 'amazon-ec2'
p.provider_type { ProviderType.find_by_codename("ec2") }
- p.url 'http://localhost:3001/api'
- p.hardware_profiles { |hp| [hp.association(:ec2_hwp1)] }
- p.after_create { |p| p.realms << Factory(:realm4, :provider => p) }
-end
-
-Factory.define :ec2_provider_no_builds, :parent => :provider do |p|
- p.name 'amazon-ec2-no-builds'
- p.provider_type { ProviderType.find_by_codename("ec2") }
p.url 'http://localhost:3002/api'
p.hardware_profiles { |hp| [hp.association(:ec2_hwp1)] }
p.after_create { |p| p.realms << Factory(:realm4, :provider => p) }
I didn't have this bit, but it looks like :ec2_provider_no_builds is
unused for a long time now ... so this is fine
Thanks,
Mark.