summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-04 13:37:25 +0200
committeranonym <anonym@riseup.net>2016-06-04 13:37:25 +0200
commit5e7e510705262db25946f4e502051eeda31dc29b (patch)
treec0595cb1ae127110e856d5a170c89f3eb9cb3614
parent4a2d9805af37e52ecc0a00454d441b77737359a6 (diff)
parent08c08e67937f3d6fadd266dc2ab43c0877b2963e (diff)
Merge branch 'testing' into devel
-rw-r--r--features/torified_browsing.feature11
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins.mdwn6
2 files changed, 3 insertions, 14 deletions
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 222e350..52fda62 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -45,17 +45,6 @@ Feature: Browsing the web using the Tor Browser
And I click the HTML5 play button
And 1 application is playing audio after 10 seconds
- @check_tor_leaks @fragile
- Scenario: Watching a WebM video
- Given I have started Tails from DVD and logged in and the network is connected
- When I start the Tor Browser
- And the Tor Browser has started and loaded the startup page
- And I open the address "https://tails.boum.org/lib/test_suite/test.webm" in the Tor Browser
- And I click the blocked video icon
- And I see "TorBrowserNoScriptTemporarilyAllowDialog.png" after at most 30 seconds
- And I accept to temporarily allow playing this video
- Then I see "TorBrowserSampleRemoteWebMVideoFrame.png" after at most 180 seconds
-
Scenario: I can view a file stored in "~/Tor Browser" but not in ~/.gnupg
Given I have started Tails from DVD and logged in and the network is connected
And I copy "/usr/share/synaptic/html/index.html" to "/home/amnesia/Tor Browser/synaptic.html" as user "amnesia"
diff --git a/wiki/src/contribute/working_together/roles/sysadmins.mdwn b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
index 7738c5d..c0b6e5b 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
@@ -126,8 +126,7 @@ We use Redmine tickets for public discussion and tasks management:
need, which provides the freezable APT repositories feature needed
by the Tails development and QA processes
* [[documentation|contribute/APT repository/time-based snapshots]]
-* access: anyone can read, release managers have some write access
- (XXX: limited to the operations they need to perform? full?)
+* access: anyone can read, release managers have write access
* tools: [[!debpts reprepro]]
* configuration: `tails::reprepro::snapshots::time_based` class
in [[!tails_gitweb_repo puppet-tails]]
@@ -137,7 +136,8 @@ We use Redmine tickets for public discussion and tasks management:
* purpose: host partial snapshots of the upstream APT repositories we
need, for historical purposes and compliance with some licenses
* [[documentation|contribute/APT repository/tagged snapshots]]
-* access: anyone can read, release managers can create new snapshots
+* access: anyone can read, release managers can create and publish new
+ snapshots
* tools: [[!debpts reprepro]]
* configuration: `tails::reprepro::snapshots::tagged` class
in [[!tails_gitweb_repo puppet-tails]]