ops_manager_ui_drivers 1.8.1 → 1.8.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ops_manager_ui_drivers/logger.rb +15 -0
- data/lib/ops_manager_ui_drivers/page_helpers.rb +27 -11
- data/lib/ops_manager_ui_drivers/version.rb +1 -1
- data/lib/ops_manager_ui_drivers/version14/ops_manager_director.rb +1 -1
- data/lib/ops_manager_ui_drivers/wait_helper.rb +8 -8
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5ab254bcb62f570df15d4a3952b5901f96368846
|
4
|
+
data.tar.gz: b65a15fbf454137e941929139b1d122640371e73
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d40b4872893ae5a8454d784bec4bac0b181487d80a2c91bde804fbeedb1ec661dc9a2f7f09dc38cc399b690280a77bd8dbb35c0a7ae74b45947aded074503100
|
7
|
+
data.tar.gz: cf2c96427728341f51110b20026616867f7f08168125eae41a5d878cd4b85171f7cbf2050b06a0aa29d4a0232094372143d2cff50d558c2f69fac084480df530
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module OpsManagerUiDrivers
|
2
|
+
module Logger
|
3
|
+
def self.logger=(logger)
|
4
|
+
@logger = logger
|
5
|
+
end
|
6
|
+
|
7
|
+
def self.logger
|
8
|
+
@logger ||= ::Logger.new(STDOUT)
|
9
|
+
end
|
10
|
+
|
11
|
+
def self.debug(string)
|
12
|
+
logger.debug("#{string} @ #{DateTime.now}")
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -4,20 +4,36 @@ module OpsManagerUiDrivers
|
|
4
4
|
module PageHelpers
|
5
5
|
include OpsManagerUiDrivers::WaitHelper
|
6
6
|
|
7
|
-
def om_1_4(ops_manager_url)
|
8
|
-
@om_1_4 ||= create_web_ui(
|
7
|
+
def om_1_4(ops_manager_url, browser = self)
|
8
|
+
@om_1_4 ||= create_web_ui(
|
9
|
+
ops_manager_url: ops_manager_url,
|
10
|
+
browser: browser,
|
11
|
+
version_module: Version14,
|
12
|
+
)
|
9
13
|
end
|
10
14
|
|
11
|
-
def om_1_5(ops_manager_url)
|
12
|
-
@om_1_5 ||= create_web_ui(
|
15
|
+
def om_1_5(ops_manager_url, browser = self)
|
16
|
+
@om_1_5 ||= create_web_ui(
|
17
|
+
ops_manager_url: ops_manager_url,
|
18
|
+
browser: browser,
|
19
|
+
version_module: Version15,
|
20
|
+
)
|
13
21
|
end
|
14
22
|
|
15
|
-
def om_1_6(ops_manager_url)
|
16
|
-
@om_1_6 ||= create_web_ui(
|
23
|
+
def om_1_6(ops_manager_url, browser = self)
|
24
|
+
@om_1_6 ||= create_web_ui(
|
25
|
+
ops_manager_url: ops_manager_url,
|
26
|
+
browser: browser,
|
27
|
+
version_module: Version16,
|
28
|
+
)
|
17
29
|
end
|
18
30
|
|
19
|
-
def om_rc(ops_manager_url)
|
20
|
-
@om_1_7 ||= create_web_ui(
|
31
|
+
def om_rc(ops_manager_url, browser = self)
|
32
|
+
@om_1_7 ||= create_web_ui(
|
33
|
+
ops_manager_url: ops_manager_url,
|
34
|
+
browser: browser,
|
35
|
+
version_module: Version17,
|
36
|
+
)
|
21
37
|
end
|
22
38
|
|
23
39
|
def api_1_4(host:, username:, password:)
|
@@ -38,10 +54,10 @@ module OpsManagerUiDrivers
|
|
38
54
|
|
39
55
|
private
|
40
56
|
|
41
|
-
def create_web_ui(ops_manager_url
|
57
|
+
def create_web_ui(ops_manager_url:, browser:, version_module:)
|
42
58
|
Capybara.app_host = ops_manager_url
|
43
|
-
|
44
|
-
version_module::WebUi.new(browser:
|
59
|
+
Logger.debug "Preparing to interact with #{version_module.inspect} at #{Capybara.app_host}"
|
60
|
+
version_module::WebUi.new(browser: browser)
|
45
61
|
end
|
46
62
|
end
|
47
63
|
end
|
@@ -36,7 +36,7 @@ module OpsManagerUiDrivers
|
|
36
36
|
username: test_settings.ops_manager.vcenter.creds.username,
|
37
37
|
password: test_settings.ops_manager.vcenter.creds.password,
|
38
38
|
datacenter: test_settings.ops_manager.vcenter.datacenter,
|
39
|
-
datastores: test_settings.ops_manager.vcenter.
|
39
|
+
datastores: test_settings.ops_manager.vcenter.persistent_datastore,
|
40
40
|
)
|
41
41
|
when OpsManagerUiDrivers::AWS_IAAS_TYPE then
|
42
42
|
configure_aws(
|
@@ -11,14 +11,14 @@ module OpsManagerUiDrivers
|
|
11
11
|
blk.call
|
12
12
|
rescue EarlyFailException
|
13
13
|
raise
|
14
|
-
rescue RSpec::Expectations::ExpectationNotMetError, StandardError
|
15
|
-
|
14
|
+
rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
|
15
|
+
Logger.debug "------- retries_left=#{retries_left}"
|
16
16
|
retries_left -= 1
|
17
17
|
if retries_left > 0
|
18
18
|
sleep(interval)
|
19
19
|
retry
|
20
20
|
else
|
21
|
-
|
21
|
+
Logger.debug "------- propagate error=#{e}"
|
22
22
|
raise
|
23
23
|
end
|
24
24
|
end
|
@@ -36,26 +36,26 @@ module OpsManagerUiDrivers
|
|
36
36
|
private
|
37
37
|
|
38
38
|
def wait_debug(title, &blk)
|
39
|
-
|
39
|
+
Logger.debug "--- BEGIN #{title}"
|
40
40
|
Benchmark.bm do |x|
|
41
41
|
x.report { blk.call }
|
42
42
|
end
|
43
43
|
ensure
|
44
|
-
|
44
|
+
Logger.debug "--- END #{title}"
|
45
45
|
end
|
46
46
|
|
47
47
|
def wait_until(end_time, &blk)
|
48
48
|
blk.call
|
49
49
|
rescue EarlyFailException
|
50
50
|
raise
|
51
|
-
rescue RSpec::Expectations::ExpectationNotMetError, StandardError
|
51
|
+
rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
|
52
52
|
seconds_left = (end_time - Time.now).round
|
53
|
-
|
53
|
+
Logger.debug "------- time_left=#{seconds_left} sec"
|
54
54
|
if seconds_left > SLEEP_INTERVAL
|
55
55
|
sleep(SLEEP_INTERVAL)
|
56
56
|
retry
|
57
57
|
else
|
58
|
-
|
58
|
+
Logger.debug "------- propagate error=#{e}"
|
59
59
|
raise
|
60
60
|
end
|
61
61
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ops_manager_ui_drivers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.
|
4
|
+
version: 1.8.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pivotal, Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-10-
|
11
|
+
date: 2015-10-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: capybara
|
@@ -168,6 +168,7 @@ files:
|
|
168
168
|
- bin/setup
|
169
169
|
- ci/run_specs.sh
|
170
170
|
- lib/ops_manager_ui_drivers.rb
|
171
|
+
- lib/ops_manager_ui_drivers/logger.rb
|
171
172
|
- lib/ops_manager_ui_drivers/page_helpers.rb
|
172
173
|
- lib/ops_manager_ui_drivers/version.rb
|
173
174
|
- lib/ops_manager_ui_drivers/version14/api.rb
|