Merge pull request #149 from rod-hynes/master

Re-enable untunneled upgrade download tests

.travis.yml

@@ -16,5 +16,5 @@ before_install:
 - go get github.com/axw/gocov/gocov
 - go get github.com/mattn/goveralls
 - if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
-- openssl aes-256-cbc -K $encrypted_ae0fe824cc69_key -iv $encrypted_ae0fe824cc69_iv
+- openssl aes-256-cbc -K $encrypted_bf83b4ab4874_key -iv $encrypted_bf83b4ab4874_iv
   -in psiphon/controller_test.config.enc -out psiphon/controller_test.config -d

psiphon/controller_test.go

@@ -51,11 +51,6 @@ func TestMain(m *testing.M) {
 // initialized in order to to clear out its data entries
 // and be able to arbitrarily order the tests.
 
-/*
-
-TODO: temporarily disabled pending automation
-      support for untunneled upgrade downloads.
-
 func TestUntunneledUpgradeDownload(t *testing.T) {
 	doUntunnledUpgradeDownload(t, false)
 }
@@ -63,7 +58,6 @@ func TestUntunneledUpgradeDownload(t *testing.T) {
 func TestUntunneledResumableUpgradeDownload(t *testing.T) {
 	doUntunnledUpgradeDownload(t, true)
 }
-*/
 
 func TestControllerRunSSH(t *testing.T) {
 	controllerRun(t, TUNNEL_PROTOCOL_SSH, false)