Commit 0871fde5 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'devel' into testing

parents e90509ee d65485f1
features/images/PidginAccount_I2P.png

1.64 KB | W: | H:

features/images/PidginAccount_I2P.png

2.05 KB | W: | H:

features/images/PidginAccount_I2P.png
features/images/PidginAccount_I2P.png
features/images/PidginAccount_I2P.png
features/images/PidginAccount_I2P.png
  • 2-up
  • Swipe
  • Onion skin
features/images/PidginMenuAccounts.png

1.06 KB | W: | H:

features/images/PidginMenuAccounts.png

1.01 KB | W: | H:

features/images/PidginMenuAccounts.png
features/images/PidginMenuAccounts.png
features/images/PidginMenuAccounts.png
features/images/PidginMenuAccounts.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -61,6 +61,7 @@ Feature: Chatting anonymously using Pidgin
When I start Pidgin through the GNOME menu
Then I see Pidgin's account manager window
When I activate the "irc.oftc.net" Pidgin account
And I close Pidgin's account manager window
Then Pidgin successfully connects to the "irc.oftc.net" account
And I can join the "#tails" channel on "irc.oftc.net"
When I type "/topic"
......
......@@ -15,7 +15,7 @@ def check_for_seahorse_error
end
end
def start_or_restart_seahorse(withapplet = nil)
def start_or_restart_seahorse(withapplet = false)
if withapplet
seahorse_menu_click_helper('GpgAppletIconNormal.png', 'GpgAppletManageKeys.png')
else
......@@ -87,10 +87,7 @@ When /^the "([^"]+)" key is in the live user's public keyring(?: after at most (
end
When /^I start Seahorse( via the Tails OpenPGP Applet)?$/ do |withgpgapplet|
if withgpgapplet
@withgpgapplet = 'yes'
end
start_or_restart_seahorse(withapplet = @withgpgapplet)
start_or_restart_seahorse(withgpgapplet)
end
Then /^Seahorse has opened$/ do
......@@ -120,7 +117,7 @@ Then /^I synchronize keys in Seahorse$/ do
if @screen.exists('GnomeCloseButton.png') || !$vm.has_process?('seahorse')
step 'I kill the process "seahorse"' if $vm.has_process?('seahorse')
debug_log('Restarting Seahorse.')
start_or_restart_seahorse(withapplet = @withgpgapplet)
start_or_restart_seahorse(withgpgapplet)
end
end
......@@ -153,10 +150,7 @@ Then /^I synchronize keys in Seahorse$/ do
end
When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the Tails OpenPGP Applet)?$/ do |keyid, withgpgapplet|
if withgpgapplet
@withgpgapplet = 'yes'
end
start_or_restart_seahorse(withapplet = @withgpgapplet)
start_or_restart_seahorse(withgpgapplet)
def change_of_status?(keyid)
# Due to a lack of visual feedback in Seahorse we'll break out of the
......
......@@ -50,11 +50,7 @@ def bind_java_to_pseudo_fifo_logger
end
def findfailed_hook(pic)
STDERR.puts ""
STDERR.puts "FindFailed for: #{pic}"
STDERR.puts ""
STDERR.puts "Update the image and press RETURN to retry"
STDIN.gets
pause("FindFailed for: '#{pic}'")
end
# Since rjb imports Java classes without creating a corresponding
......
......@@ -31,7 +31,17 @@ class VMStorage
unless @pool
pool_xml.elements['pool/target/path'].text = @pool_path
@pool = @virt.define_storage_pool_xml(pool_xml.to_s)
@pool.build unless Dir.exists?(@pool_path)
if not(Dir.exists?(@pool_path))
# We'd like to use @pool.build, which will just create the
# @pool_path directory, but it does so with root:root as owner
# (at least with libvirt 1.2.21-2). libvirt itself can handle
# that situation, but guestfs (at least with <=
# 1:1.28.12-1+b3) cannot when invoked by a non-root user,
# which we want to support.
FileUtils.mkdir(@pool_path)
FileUtils.chown(nil, 'libvirt-qemu', @pool_path)
FileUtils.chmod("ug+wrx", @pool_path)
end
end
@pool.create unless @pool.active?
@pool.refresh
......
......@@ -141,7 +141,7 @@ end
# Cucumber Before hooks are executed in the order they are listed, and
# we want this hook to always run first, so it must always be the
# *first* Before hook matching @product.
# *first* Before hook matching @product listed in this file.
Before('@product') do |scenario|
$failure_artifacts = Array.new
if $config["CAPTURE"]
......@@ -169,8 +169,10 @@ Before('@product') do |scenario|
end
# Cucumber After hooks are executed in the *reverse* order they are
# listed, and we want this hook to always run last, so it must always
# be the *first* After hook matching @product.
# listed, and we want this hook to always run second last, so it must always
# be the *second* After hook matching @product listed in this file --
# hooks added dynamically via add_after_scenario_hook() are supposed to
# truly be last.
After('@product') do |scenario|
if @video_capture_pid
# We can be incredibly fast at detecting errors sometimes, so the
......
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