Commit 0eb607bc authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/stable' into feature/9560-tor-0.2.6.9

parents 62626519 5f6065d9
......@@ -207,7 +207,7 @@ def chan_image (account, channel, image)
images = {
'irc.oftc.net' => {
'#tails' => {
'roaster' => 'PidginTailsChannelEntry',
'roster' => 'PidginTailsChannelEntry',
'conversation_tab' => 'PidginTailsConversationTab',
'welcome' => 'PidginTailsChannelWelcome',
}
......@@ -282,7 +282,7 @@ end
Then /^Pidgin successfully connects to the "([^"]+)" account$/ do |account|
next if @skip_steps_while_restoring_background
expected_channel_entry = chan_image(account, default_chan(account), 'roaster')
expected_channel_entry = chan_image(account, default_chan(account), 'roster')
# Sometimes the OFTC welcome notice window pops up over the buddy list one...
@vm.focus_window('Buddy List')
@screen.wait(expected_channel_entry, 60)
......@@ -306,8 +306,11 @@ end
Then /^I can join the "([^"]+)" channel on "([^"]+)"$/ do |channel, account|
next if @skip_steps_while_restoring_background
@screen.doubleClick( chan_image(account, channel, 'roaster'))
@screen.doubleClick( chan_image(account, channel, 'roster'))
@screen.hide_cursor
@vm.focus_window(".*\.oftc\.net$")
@screen.wait_and_click(chan_image(account, channel, 'conversation_tab'), 10)
@screen.hide_cursor
@screen.wait( chan_image(account, channel, 'welcome'), 10)
end
......@@ -385,7 +388,14 @@ When /^I close Pidgin's certificate import failure dialog$/ do
end
When /^I see the Tails roadmap URL$/ do
@screen.wait('PidginTailsRoadmapUrl.png', 10)
try_for(60) do
begin
@screen.find('PidginTailsRoadmapUrl.png')
rescue FindFailed => e
@screen.click('PidginScrollArrowUp.png')
raise e
end
end
end
When /^I click on the Tails roadmap URL$/ do
......
......@@ -27,6 +27,12 @@ end
# YAML's type autodetection on ENV some how.
$config.merge!(ENV)
# Export TMPDIR back to the environment for subprocesses that we start
# (e.g. guestfs). Note that this export will only make a difference if
# TMPDIR wasn't already set and --tmpdir wasn't passed, i.e. only when
# we use the default.
ENV['TMPDIR'] = $config['TMPDIR']
# Dynamic constants initialized through the environment or similar,
# e.g. options we do not want to be configurable through the YAML
# configuration files.
......
......@@ -28,7 +28,7 @@ class VMStorage
@pool_path = "#{$config["TMPDIR"]}/#{pool_name}"
pool_xml.elements['pool/target/path'].text = @pool_path
@pool = @virt.define_storage_pool_xml(pool_xml.to_s)
@pool.build
@pool.build unless Dir.exists?(@pool_path)
@pool.create
@pool.refresh
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment