Commit d8d8ecd0 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'bugfix/10754-electrum-2.5.4-2' into devel

Fix-committed: #10754, #10758
parents 6d33424f 97386f05
......@@ -7,7 +7,7 @@ Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: firmware-amd-graphics
......@@ -139,7 +139,7 @@ Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: python-electrum
Pin: release o=Debian Backports,n=jessie-backports
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: ttdnsd
......
......@@ -396,3 +396,6 @@ xdotool
i2p
# Prevent java 6 from being installed
openjdk-7-jre
# Enable Electrum's Qt GUI
python-qt4
......@@ -25,6 +25,7 @@ Feature: Electrum Bitcoin client
When I create a new bitcoin wallet
Then a bitcoin wallet is present
And I see the main Electrum client window
And Electrum successfully connects to the network
And I shutdown Tails and wait for the computer to power off
Given I start Tails from USB drive "current" and I login with persistence enabled
When I start Electrum through the GNOME menu
......
......@@ -21,9 +21,10 @@ When /^I create a new bitcoin wallet$/ do
@screen.wait_and_click("ElectrumWalletSeedTextbox.png", 15)
@screen.type('a', Sikuli::KeyModifier.CTRL) # select wallet seed
@screen.type('c', Sikuli::KeyModifier.CTRL) # copy seed to clipboard
seed = $vm.get_clipboard
@screen.wait_and_click("ElectrumNextButton.png", 15)
@screen.wait("ElectrumWalletSeedTextbox.png", 15)
@screen.type('v', Sikuli::KeyModifier.CTRL) # Confirm seed
@screen.type(seed) # Confirm seed
@screen.wait_and_click("ElectrumNextButton.png", 10)
@screen.wait_and_click("ElectrumEncryptWallet.png", 10)
@screen.type("asdf" + Sikuli::Key.TAB) # set password
......@@ -47,5 +48,5 @@ Then /^I see the main Electrum client window$/ do
end
Then /^Electrum successfully connects to the network$/ do
@screen.wait('ElectrumStatus.png', 180)
@screen.wait('ElectrumStatus.png', 180)
end
......@@ -530,6 +530,10 @@ EOF
:user => LIVE_USER)
end
def get_clipboard
execute_successfully("xsel --output --clipboard", :user => LIVE_USER).stdout
end
def internal_snapshot_xml(name)
disk_devs = list_disk_devs
disks_xml = " <disks>\n"
......
Markdown is supported
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