summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform.rb1
-rw-r--r--provider_base/services/tor.json2
-rw-r--r--tests/white-box/network.rb2
3 files changed, 3 insertions, 2 deletions
diff --git a/platform.rb b/platform.rb
index 3882ed8d..689c58b7 100644
--- a/platform.rb
+++ b/platform.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
#
# These are variables defined by this leap_platform and used by leap_cli.
#
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json
index ed75285c..ae4da46d 100644
--- a/provider_base/services/tor.json
+++ b/provider_base/services/tor.json
@@ -1,6 +1,6 @@
{
"tor": {
"bandwidth_rate": 6550,
- "contacts": "= provider.contacts['tor'] || provider.contacts.default"
+ "contacts": "= [provider.contacts['tor'] || provider.contacts.default].flatten"
}
}
diff --git a/tests/white-box/network.rb b/tests/white-box/network.rb
index 14de2eac..955857dc 100644
--- a/tests/white-box/network.rb
+++ b/tests/white-box/network.rb
@@ -53,8 +53,8 @@ class Network < LeapTest
end
all_stunnel_pids = pgrep('/usr/bin/stunnel').collect{|process| process[:pid]}.uniq
assert_equal good_stunnel_pids.sort, all_stunnel_pids.sort, "There should not be any extra stunnel processes that are not configured in /etc/stunnel"
+ pass
end
- pass
end
end