Commit 1a6f57b1 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'test/15771-use-reliable-gnupg-key+force-all-tests' into devel (Fix-committed: #15771)

parents 0506ce79 2011c503
features/images/SeahorseFoundKeyResult.png

856 Bytes | W: | H:

features/images/SeahorseFoundKeyResult.png

4.54 KB | W: | H:

features/images/SeahorseFoundKeyResult.png
features/images/SeahorseFoundKeyResult.png
features/images/SeahorseFoundKeyResult.png
features/images/SeahorseFoundKeyResult.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -27,12 +27,12 @@ def start_or_restart_seahorse ...@@ -27,12 +27,12 @@ def start_or_restart_seahorse
step 'Seahorse has opened' step 'Seahorse has opened'
end end
Then /^the key "([^"]+)" has (only|more than) (\d+) signatures$/ do |key, qualifier, num| Then /^the key "([^"]+)" has (less|more) than (\d+) signatures$/ do |key, qualifier, num|
count = count_gpg_signatures(key) count = count_gpg_signatures(key)
case qualifier case qualifier
when 'only' when 'less'
assert_equal(count, num.to_i, "Expected #{num} signatures but instead found #{count}") assert(count < num.to_i, "Expected less than #{num} signatures but found #{count}")
when 'more than' when 'more'
assert(count > num.to_i, "Expected more than #{num} signatures but found #{count}") assert(count > num.to_i, "Expected more than #{num} signatures but found #{count}")
else else
raise "Unknown operator #{qualifier} passed" raise "Unknown operator #{qualifier} passed"
...@@ -137,7 +137,7 @@ Then /^I synchronize keys in Seahorse$/ do ...@@ -137,7 +137,7 @@ Then /^I synchronize keys in Seahorse$/ do
# Due to a lack of visual feedback in Seahorse we'll break out of the # Due to a lack of visual feedback in Seahorse we'll break out of the
# try_for loop below by returning "true" when there's something we can act # try_for loop below by returning "true" when there's something we can act
# upon. # upon.
if count_gpg_signatures(@fetched_openpgp_keyid) > 2 || \ if count_gpg_signatures(@fetched_openpgp_keyid) > 42 || \
@screen.exists('GnomeCloseButton.png') || \ @screen.exists('GnomeCloseButton.png') || \
!$vm.has_process?('seahorse') !$vm.has_process?('seahorse')
true true
...@@ -187,6 +187,7 @@ When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the OpenPGP Applet) ...@@ -187,6 +187,7 @@ When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the OpenPGP Applet)
'seahorse') 'seahorse')
@screen.wait('SeahorseFindKeysWindow.png', 10) @screen.wait('SeahorseFindKeysWindow.png', 10)
# Seahorse doesn't seem to support searching for fingerprints # Seahorse doesn't seem to support searching for fingerprints
# (https://gitlab.gnome.org/GNOME/seahorse/issues/177)
@screen.type(keyid + Sikuli::Key.ENTER) @screen.type(keyid + Sikuli::Key.ENTER)
begin begin
@screen.waitAny(['SeahorseFoundKeyResult.png', @screen.waitAny(['SeahorseFoundKeyResult.png',
......
...@@ -8,46 +8,46 @@ Feature: Keyserver interaction with GnuPG ...@@ -8,46 +8,46 @@ Feature: Keyserver interaction with GnuPG
Background: Background:
Given I have started Tails from DVD and logged in and the network is connected Given I have started Tails from DVD and logged in and the network is connected
And the "10CC5BC7" OpenPGP key is not in the live user's public keyring And the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" OpenPGP key is not in the live user's public keyring
And GnuPG is configured to use Chutney's onion keyserver And GnuPG is configured to use Chutney's onion keyserver
And Seahorse is configured to use Chutney's onion keyserver And Seahorse is configured to use Chutney's onion keyserver
Scenario: Fetching OpenPGP keys using GnuPG should work and be done over Tor. Scenario: Fetching OpenPGP keys using GnuPG should work and be done over Tor.
When I fetch the "10CC5BC7" OpenPGP key using the GnuPG CLI When I fetch the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" OpenPGP key using the GnuPG CLI
And the GnuPG fetch is successful And the GnuPG fetch is successful
Then the "10CC5BC7" key is in the live user's public keyring Then the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" key is in the live user's public keyring
And GnuPG's dirmngr uses the configured keyserver And GnuPG's dirmngr uses the configured keyserver
Scenario: Fetching OpenPGP keys using Seahorse should work and be done over Tor. Scenario: Fetching OpenPGP keys using Seahorse should work and be done over Tor.
When I fetch the "10CC5BC7" OpenPGP key using Seahorse When I fetch the "D21739E9" OpenPGP key using Seahorse
And the Seahorse operation is successful And the Seahorse operation is successful
Then the "10CC5BC7" key is in the live user's public keyring Then the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" key is in the live user's public keyring
Scenario: Fetching OpenPGP keys using Seahorse via the OpenPGP Applet should work and be done over Tor. Scenario: Fetching OpenPGP keys using Seahorse via the OpenPGP Applet should work and be done over Tor.
When I fetch the "10CC5BC7" OpenPGP key using Seahorse via the OpenPGP Applet When I fetch the "D21739E9" OpenPGP key using Seahorse via the OpenPGP Applet
And the Seahorse operation is successful And the Seahorse operation is successful
Then the "10CC5BC7" key is in the live user's public keyring Then the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" key is in the live user's public keyring
Scenario: Syncing OpenPGP keys using Seahorse should work and be done over Tor. Scenario: Syncing OpenPGP keys using Seahorse should work and be done over Tor.
Given I fetch the "10CC5BC7" OpenPGP key using the GnuPG CLI without any signatures Given I fetch the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" OpenPGP key using the GnuPG CLI without any signatures
And the GnuPG fetch is successful And the GnuPG fetch is successful
And the "10CC5BC7" key is in the live user's public keyring And the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" key is in the live user's public keyring
But the key "10CC5BC7" has only 2 signatures But the key "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" has less than 42 signatures
When I start Seahorse When I start Seahorse
Then Seahorse has opened Then Seahorse has opened
And I enable key synchronization in Seahorse And I enable key synchronization in Seahorse
And I synchronize keys in Seahorse And I synchronize keys in Seahorse
And the Seahorse operation is successful And the Seahorse operation is successful
Then the key "10CC5BC7" has more than 2 signatures Then the key "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" has more than 42 signatures
Scenario: Syncing OpenPGP keys using Seahorse started from the OpenPGP Applet should work and be done over Tor. Scenario: Syncing OpenPGP keys using Seahorse started from the OpenPGP Applet should work and be done over Tor.
Given I fetch the "10CC5BC7" OpenPGP key using the GnuPG CLI without any signatures Given I fetch the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" OpenPGP key using the GnuPG CLI without any signatures
And the GnuPG fetch is successful And the GnuPG fetch is successful
And the "10CC5BC7" key is in the live user's public keyring And the "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" key is in the live user's public keyring
But the key "10CC5BC7" has only 2 signatures But the key "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" has less than 42 signatures
When I start Seahorse via the OpenPGP Applet When I start Seahorse via the OpenPGP Applet
Then Seahorse has opened Then Seahorse has opened
And I enable key synchronization in Seahorse And I enable key synchronization in Seahorse
And I synchronize keys in Seahorse And I synchronize keys in Seahorse
And the Seahorse operation is successful And the Seahorse operation is successful
Then the key "10CC5BC7" has more than 2 signatures Then the key "0EE5BE979282D80B9F7540F1CCD2ED94D21739E9" has more than 42 signatures
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