Commit 4d78082c authored by bertagaz's avatar bertagaz
Browse files

Merge remote-tracking branch 'origin/feature/8243-meek' into devel

Fix-committed: #8243
parents 68a0c062 d9279ba4
......@@ -53,9 +53,9 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
# Explanation: systemd > v233 required for meek_lite and enable the unsafe
# browser and Tor launcher applications to do clearnet DNS resolution. (#8243)
Package: systemd libsystemd0 libpam-systemd systemd-sysv
Explanation: src:systemd
Explanation: systemd >= v233 required for meek_lite and enable the unsafe browser and Tor launcher applications to do clearnet DNS resolution. (#8243)
Package: systemd systemd-sysv systemd-container systemd-journal-remote systemd-coredump systemd-tests libpam-systemd libnss-myhostname libnss-mymachines libnss-resolve libnss-systemd libsystemd0 libsystemd-dev udev libudev1 libudev-dev udev-udeb libudev1-udeb
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
......
......@@ -3,7 +3,7 @@
# command over the remote shell and get the answer back, parsing and
# post-processing of the result, etc.
def max_time_drift
10
15
end
When /^I set the system time to "([^"]+)"$/ do |time|
......@@ -61,9 +61,20 @@ Then /^the system clock is just past Tails' source date$/ do
assert(diff > 0,
"The system time (#{system_time}) is before the Tails " +
"source date (#{source_time})")
assert(diff <= max_diff,
"The system time (#{system_time}) is more than #{max_diff} seconds " +
"past the source date (#{source_time})")
if diff <= max_diff
# In this case the only acceptable explanation is that systemd
# adjusted the time.
systemd_has_adjusted_time = $vm.execute(
"journalctl | grep 'System time before build time, advancing clock'"
).success?
if ! systemd_has_adjusted_time
raise(
"The system time (#{system_time}) is more than #{max_diff} seconds " +
"past the source date (#{source_time}) and systemd was not involved"
)
end
end
end
Then /^Tails' hardware clock is close to the host system's time$/ do
......
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