6a0f119fc2
This test failure from #92 inspired this change: https://travis-ci.org/bitly/google_auth_proxy/jobs/62425336 2015/05/13 16:27:33 using authenticated emails file /tmp/test_auth_emails_952353477 2015/05/13 16:27:33 watching /tmp/test_auth_emails_952353477 for updates 2015/05/13 16:27:33 validating: is xyzzy@example.com valid? true 2015/05/13 16:27:33 watching interrupted on event: "/tmp/test_auth_emails_952353477": CHMOD 2015/05/13 16:27:33 watching resumed for /tmp/test_auth_emails_952353477 2015/05/13 16:27:33 reloading after event: "/tmp/test_auth_emails_952353477": CHMOD 2015/05/13 16:27:33 watching interrupted on event: "/tmp/test_auth_emails_952353477": REMOVE 2015/05/13 16:27:33 validating: is xyzzy@example.com valid? false 2015/05/13 16:27:33 watching resumed for /tmp/test_auth_emails_952353477 2015/05/13 16:27:33 reloading after event: "/tmp/test_auth_emails_952353477": REMOVE 2015/05/13 16:27:33 failed opening authenticated-emails-file="/tmp/test_auth_emails_952353477", open /tmp/test_auth_emails_952353477: no such file or directory I believe that what happened was that the call to reload the file after the second "reloading after event" lost the race when the test shut down and the file was removed. This change introduces a `done` channel that ensures outstanding actions complete and the watcher exits before the test removes the file.
104 lines
2.5 KiB
Go
104 lines
2.5 KiB
Go
// +build go1.3
|
|
// +build !plan9,!solaris
|
|
|
|
package main
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"testing"
|
|
)
|
|
|
|
func (vt *ValidatorTest) UpdateEmailFile(t *testing.T, emails []string) {
|
|
var err error
|
|
vt.auth_email_file, err = os.OpenFile(
|
|
vt.auth_email_file.Name(), os.O_WRONLY|os.O_CREATE, 0600)
|
|
if err != nil {
|
|
t.Fatal("failed to re-open temp file for updates")
|
|
}
|
|
vt.WriteEmails(t, emails)
|
|
}
|
|
|
|
func (vt *ValidatorTest) UpdateEmailFileViaRenameAndReplace(
|
|
t *testing.T, emails []string) {
|
|
orig_file := vt.auth_email_file
|
|
var err error
|
|
vt.auth_email_file, err = ioutil.TempFile("", "test_auth_emails_")
|
|
if err != nil {
|
|
t.Fatal("failed to create temp file for rename and replace: " +
|
|
err.Error())
|
|
}
|
|
vt.WriteEmails(t, emails)
|
|
|
|
moved_name := orig_file.Name() + "-moved"
|
|
err = os.Rename(orig_file.Name(), moved_name)
|
|
err = os.Rename(vt.auth_email_file.Name(), orig_file.Name())
|
|
if err != nil {
|
|
t.Fatal("failed to rename and replace temp file: " +
|
|
err.Error())
|
|
}
|
|
vt.auth_email_file = orig_file
|
|
os.Remove(moved_name)
|
|
}
|
|
|
|
func TestValidatorOverwriteEmailListDirectly(t *testing.T) {
|
|
vt := NewValidatorTest(t)
|
|
defer vt.TearDown()
|
|
|
|
vt.WriteEmails(t, []string{
|
|
"xyzzy@example.com",
|
|
"plugh@example.com",
|
|
})
|
|
domains := []string(nil)
|
|
updated := make(chan bool)
|
|
validator := vt.NewValidator(domains, updated)
|
|
|
|
if !validator("xyzzy@example.com") {
|
|
t.Error("first email in list should validate")
|
|
}
|
|
if !validator("plugh@example.com") {
|
|
t.Error("second email in list should validate")
|
|
}
|
|
if validator("xyzzy.plugh@example.com") {
|
|
t.Error("email not in list that matches no domains " +
|
|
"should not validate")
|
|
}
|
|
|
|
vt.UpdateEmailFile(t, []string{
|
|
"xyzzy.plugh@example.com",
|
|
"plugh@example.com",
|
|
})
|
|
<-updated
|
|
|
|
if validator("xyzzy@example.com") {
|
|
t.Error("email removed from list should not validate")
|
|
}
|
|
if !validator("plugh@example.com") {
|
|
t.Error("email retained in list should validate")
|
|
}
|
|
if !validator("xyzzy.plugh@example.com") {
|
|
t.Error("email added to list should validate")
|
|
}
|
|
}
|
|
|
|
func TestValidatorOverwriteEmailListViaRenameAndReplace(t *testing.T) {
|
|
vt := NewValidatorTest(t)
|
|
defer vt.TearDown()
|
|
|
|
vt.WriteEmails(t, []string{"xyzzy@example.com"})
|
|
domains := []string(nil)
|
|
updated := make(chan bool)
|
|
validator := vt.NewValidator(domains, updated)
|
|
|
|
if !validator("xyzzy@example.com") {
|
|
t.Error("email in list should validate")
|
|
}
|
|
|
|
vt.UpdateEmailFileViaRenameAndReplace(t, []string{"plugh@example.com"})
|
|
<-updated
|
|
|
|
if validator("xyzzy@example.com") {
|
|
t.Error("email removed from list should not validate")
|
|
}
|
|
}
|